diff options
author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1994-11-08 18:44:14 +0000 |
---|---|---|
committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1994-11-08 18:44:14 +0000 |
commit | 700b814a89757cc6e91538ad6a32ba5d63dda7be (patch) | |
tree | e760dfdfd0dce19abc8d34facfeaa0769745ea90 /sbin/sysinstall/exec.c | |
parent | 7adc28f048f896d866d704f5d098e5f1f9d5ee8e (diff) | |
download | src-700b814a89757cc6e91538ad6a32ba5d63dda7be.tar.gz src-700b814a89757cc6e91538ad6a32ba5d63dda7be.zip |
Poul's and my idea of avoiding the last reboot at the end was
too ambitious; we can't make the transiton from install to /sbin/init
without another reboot. Sigh.. Oh well, not that big a deal.
Notes
Notes:
svn path=/head/; revision=4291
Diffstat (limited to 'sbin/sysinstall/exec.c')
-rw-r--r-- | sbin/sysinstall/exec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sbin/sysinstall/exec.c b/sbin/sysinstall/exec.c index 40b5eb0c52a1..00f6cd76281f 100644 --- a/sbin/sysinstall/exec.c +++ b/sbin/sysinstall/exec.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: exec.c,v 1.5 1994/10/29 10:01:32 phk Exp $ + * $Id: exec.c,v 1.6 1994/11/08 14:04:16 jkh Exp $ * */ @@ -24,6 +24,7 @@ #include <sys/wait.h> #include <sys/param.h> #include <sys/mount.h> +#include <sys/reboot.h> #include "sysinstall.h" @@ -73,8 +74,8 @@ exec(int magic, char *cmd, char *args, ...) while ((w = wait(&status)) != pid && w != -1) ; - if (w == 20 && magic == 3) /* special case for bininst */ - execl("/sbin/init", "/sbin/init", 0); + if ((status >> 8) == 20 && magic == 3) /* special case for bininst */ + reboot(RB_AUTOBOOT); if (w == -1) Fatal("Child process %s terminated abnormally\n", cmd); return(status); |