From e1a8c6b64e897c795a24f93a4be516b8c8773d80 Mon Sep 17 00:00:00 2001 From: Don Lewis Date: Sun, 5 Nov 2000 17:59:29 +0000 Subject: [PATCH] Back out change to prepend /sbin:/bin to $PATH, just overwrite $PATH with these in the normal case. Set MAKEDEVPATH in sysinstall to include the /mnt2 stuff before starting the fixit shell. --- etc/MAKEDEV | 2 +- release/sysinstall/install.c | 2 ++ usr.sbin/sade/install.c | 2 ++ usr.sbin/sysinstall/install.c | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/etc/MAKEDEV b/etc/MAKEDEV index a7d14c8a2086..1ba5f23e46ed 100644 --- a/etc/MAKEDEV +++ b/etc/MAKEDEV @@ -150,7 +150,7 @@ if [ -n "$MAKEDEVPATH" ]; then PATH="$MAKEDEVPATH" else - PATH=/sbin:/bin:$PATH + PATH=/sbin:/bin fi umask 77 diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 630e7f810351..be167ee63cf7 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -432,6 +432,8 @@ fixit_common(void) msgDebug("fixit shell: Unable to get terminal attributes!\n"); setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin:/stand:" "/mnt2/stand:/mnt2/bin:/mnt2/sbin:/mnt2/usr/bin:/mnt2/usr/sbin", 1); + setenv("MAKEDEVPATH", "/sbin:/bin:/stand:" + "/mnt2/sbin:/mnt2/bin:/mnt2/stand", 1); if (strcmp(variable_get(VAR_FIXIT_TTY), "serial") == 0) { printf("Waiting for fixit shell to exit.\n" "When you are done, type ``exit'' to exit\n" diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 630e7f810351..be167ee63cf7 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -432,6 +432,8 @@ fixit_common(void) msgDebug("fixit shell: Unable to get terminal attributes!\n"); setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin:/stand:" "/mnt2/stand:/mnt2/bin:/mnt2/sbin:/mnt2/usr/bin:/mnt2/usr/sbin", 1); + setenv("MAKEDEVPATH", "/sbin:/bin:/stand:" + "/mnt2/sbin:/mnt2/bin:/mnt2/stand", 1); if (strcmp(variable_get(VAR_FIXIT_TTY), "serial") == 0) { printf("Waiting for fixit shell to exit.\n" "When you are done, type ``exit'' to exit\n" diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 630e7f810351..be167ee63cf7 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -432,6 +432,8 @@ fixit_common(void) msgDebug("fixit shell: Unable to get terminal attributes!\n"); setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin:/stand:" "/mnt2/stand:/mnt2/bin:/mnt2/sbin:/mnt2/usr/bin:/mnt2/usr/sbin", 1); + setenv("MAKEDEVPATH", "/sbin:/bin:/stand:" + "/mnt2/sbin:/mnt2/bin:/mnt2/stand", 1); if (strcmp(variable_get(VAR_FIXIT_TTY), "serial") == 0) { printf("Waiting for fixit shell to exit.\n" "When you are done, type ``exit'' to exit\n"