aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Smith <kensmith@FreeBSD.org>2005-08-05 13:39:08 +0000
committerKen Smith <kensmith@FreeBSD.org>2005-08-05 13:39:08 +0000
commitd44cf58f45ffa31c22ac4f0fcf2369890cb2da28 (patch)
tree7f5abd37187a55e9f4fd51350681709ba5b4afc1
parentf62ed2dc459474e02a61c400855dcce1f571bc3e (diff)
Notes
-rw-r--r--usr.sbin/sade/system.c3
-rw-r--r--usr.sbin/sysinstall/system.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index ac453ea689af..00abb4ef4940 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/system.c
@@ -408,6 +408,7 @@ vsystem(char *fmt, ...)
sig_t intsave, quitsave;
char *cmd;
int i;
+ struct stat sb;
cmd = (char *)alloca(FILENAME_MAX);
cmd[0] = '\0';
@@ -438,7 +439,7 @@ vsystem(char *fmt, ...)
close(1); open("/dev/null", O_WRONLY);
dup2(1, 2);
}
- if (RunningAsInit)
+ if (stat("/stand/sh", &sb) == 0)
execl("/stand/sh", "/stand/sh", "-c", cmd, (char *)NULL);
else
execl("/bin/sh", "/bin/sh", "-c", cmd, (char *)NULL);
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index ac453ea689af..00abb4ef4940 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -408,6 +408,7 @@ vsystem(char *fmt, ...)
sig_t intsave, quitsave;
char *cmd;
int i;
+ struct stat sb;
cmd = (char *)alloca(FILENAME_MAX);
cmd[0] = '\0';
@@ -438,7 +439,7 @@ vsystem(char *fmt, ...)
close(1); open("/dev/null", O_WRONLY);
dup2(1, 2);
}
- if (RunningAsInit)
+ if (stat("/stand/sh", &sb) == 0)
execl("/stand/sh", "/stand/sh", "-c", cmd, (char *)NULL);
else
execl("/bin/sh", "/bin/sh", "-c", cmd, (char *)NULL);