summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/system.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1995-05-26 19:28:06 +0000
committerjkh <jkh@FreeBSD.org>1995-05-26 19:28:06 +0000
commit6b747bddcf3bf43203ec4f1d5388a4bb11d6f6e3 (patch)
tree997fee1538b557fbf986fbd9bdde12b7d18b2206 /usr.sbin/sysinstall/system.c
parentc6563af053bb945798648d329cceeba5bccbce41 (diff)
downloadFreeBSD-src-6b747bddcf3bf43203ec4f1d5388a4bb11d6f6e3.zip
FreeBSD-src-6b747bddcf3bf43203ec4f1d5388a4bb11d6f6e3.tar.gz
Clean up the configuration stuff a bit more - we should now populate
/etc with good things(tm). Fire off ppp with all the proper initial options set.
Diffstat (limited to 'usr.sbin/sysinstall/system.c')
-rw-r--r--usr.sbin/sysinstall/system.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index 2fdb0a7..3ce3555 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: system.c,v 1.34 1995/05/25 18:48:31 jkh Exp $
+ * $Id: system.c,v 1.35 1995/05/26 08:41:49 jkh Exp $
*
* Jordan Hubbard
*
@@ -71,7 +71,7 @@ systemInitialize(int argc, char **argv)
i = ioctl(0, TIOCSCTTY, (char *)NULL);
setlogin("root");
- setenv("PATH", "/stand:/bin:/sbin:/usr/sbin:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin", 1);
+ setenv("PATH", "/stand:/bin:/sbin:/usr/sbin:/usr/bin:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin", 1);
setbuf(stdin, 0);
setbuf(stderr, 0);
}
@@ -279,7 +279,7 @@ int
vsystem(char *fmt, ...)
{
va_list args;
- union wait pstat;
+ int pstat;
pid_t pid;
int omask;
sig_t intsave, quitsave;
@@ -343,11 +343,11 @@ vsystem(char *fmt, ...)
}
intsave = signal(SIGINT, SIG_IGN);
quitsave = signal(SIGQUIT, SIG_IGN);
- pid = waitpid(pid, (int *)&pstat, 0);
+ pid = waitpid(pid, &pstat, 0);
(void)sigsetmask(omask);
(void)signal(SIGINT, intsave);
(void)signal(SIGQUIT, quitsave);
- i = (pid == -1) ? -1 : pstat.w_status;
+ i = (pid == -1) ? -1 : WEXITSTATUS(pstat);
msgDebug("Command `%s' returns status of %d\n", cmd, i);
free(cmd);
return i;
OpenPOWER on IntegriCloud