From fcbdb5526d479461b20a63097b86e92923e69822 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Tue, 18 Feb 1997 04:36:16 +0000 Subject: Don't use /mnt in multi-user mode if we're installing a new filesystem. --- release/sysinstall/misc.c | 4 ++-- usr.sbin/sade/misc.c | 4 ++-- usr.sbin/sysinstall/misc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c index e7d40639ad81..eb2c5c4dde2a 100644 --- a/release/sysinstall/misc.c +++ b/release/sysinstall/misc.c @@ -320,8 +320,8 @@ Mount(char *mountp, void *dev) return DITEM_SUCCESS; if (*((char *)dev) != '/') { - sprintf(device, "/mnt/dev/%s", (char *)dev); - sprintf(mountpoint, "/mnt%s", mountp); + sprintf(device, "%s/dev/%s", (char *)dev, RunningAsInit ? "/mnt" : ""); + sprintf(mountpoint, "%s%s", RunningAsInit ? "/mnt" : "", mountp); } else { strcpy(device, dev); diff --git a/usr.sbin/sade/misc.c b/usr.sbin/sade/misc.c index e7d40639ad81..eb2c5c4dde2a 100644 --- a/usr.sbin/sade/misc.c +++ b/usr.sbin/sade/misc.c @@ -320,8 +320,8 @@ Mount(char *mountp, void *dev) return DITEM_SUCCESS; if (*((char *)dev) != '/') { - sprintf(device, "/mnt/dev/%s", (char *)dev); - sprintf(mountpoint, "/mnt%s", mountp); + sprintf(device, "%s/dev/%s", (char *)dev, RunningAsInit ? "/mnt" : ""); + sprintf(mountpoint, "%s%s", RunningAsInit ? "/mnt" : "", mountp); } else { strcpy(device, dev); diff --git a/usr.sbin/sysinstall/misc.c b/usr.sbin/sysinstall/misc.c index e7d40639ad81..eb2c5c4dde2a 100644 --- a/usr.sbin/sysinstall/misc.c +++ b/usr.sbin/sysinstall/misc.c @@ -320,8 +320,8 @@ Mount(char *mountp, void *dev) return DITEM_SUCCESS; if (*((char *)dev) != '/') { - sprintf(device, "/mnt/dev/%s", (char *)dev); - sprintf(mountpoint, "/mnt%s", mountp); + sprintf(device, "%s/dev/%s", (char *)dev, RunningAsInit ? "/mnt" : ""); + sprintf(mountpoint, "%s%s", RunningAsInit ? "/mnt" : "", mountp); } else { strcpy(device, dev); -- cgit v1.3