diff options
| author | green <green@FreeBSD.org> | 2002-12-17 21:23:36 +0000 |
|---|---|---|
| committer | green <green@FreeBSD.org> | 2002-12-17 21:23:36 +0000 |
| commit | 25073c9645a4b7080edf33ba35f8bcd487991e67 (patch) | |
| tree | 0c626b0b34dd0e2be604e76a004c4d398f7bd33f | |
| parent | 9811efefcf80d9ba44cd6c23e7ecb2d4077a4e22 (diff) | |
| download | FreeBSD-src-25073c9645a4b7080edf33ba35f8bcd487991e67.zip FreeBSD-src-25073c9645a4b7080edf33ba35f8bcd487991e67.tar.gz | |
Back out the previous commit, since there could be dire consequences if
/etc/rc were accidentally executed (as requested by other committeers).
| -rw-r--r-- | etc/Makefile | 6 | ||||
| -rw-r--r-- | sbin/init/init.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/etc/Makefile b/etc/Makefile index 9f64e4c..6329381 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -12,8 +12,8 @@ BIN1= amd.map apmd.conf auth.conf \ inetd.conf login.access login.conf \ mac.conf motd netconfig networks newsyslog.conf \ phones printcap profile protocols \ - rc.atm rc.devfs rc.diskless1 rc.diskless2 rc.firewall rc.firewall6 \ - rc.network rc.network6 rc.pccard rc.sendmail rc.serial \ + rc rc.atm rc.devfs rc.diskless1 rc.diskless2 rc.firewall rc.firewall6 \ + rc.network rc.network6 rc.pccard rc.sendmail rc.serial rc.shutdown \ rc.subr rc.syscons rc.sysctl remote rpc services \ shells sysctl.conf syslog.conf usbd.conf \ etc.${MACHINE_ARCH}/disktab \ @@ -37,7 +37,7 @@ SSL= ${.CURDIR}/../crypto/openssl/apps/openssl.cnf .endif # -rwxr-xr-x root:wheel, for the new cron root:wheel -BIN2= netstart pccard_ether rc.suspend rc.resume rc rc.shutdown +BIN2= netstart pccard_ether rc.suspend rc.resume DEFAULTS= rc.conf pccard.conf periodic.conf diff --git a/sbin/init/init.c b/sbin/init/init.c index 64ad43b..2ad5d95 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -737,8 +737,6 @@ runcom(void) #ifdef LOGIN_CAP setprocresources(RESOURCE_RC); #endif - execv(_PATH_RUNCOM, argv + 1); - warning("can't exec %s: %m", _PATH_RUNCOM); execv(_PATH_BSHELL, argv); stall("can't exec %s for %s: %m", _PATH_BSHELL, _PATH_RUNCOM); _exit(1); /* force single user mode */ @@ -1499,8 +1497,6 @@ runshutdown(void) #ifdef LOGIN_CAP setprocresources(RESOURCE_RC); #endif - execv(_PATH_RUNDOWN, argv + 1); - warning("can't exec %s: %m", _PATH_RUNDOWN); execv(_PATH_BSHELL, argv); warning("can't exec %s for %s: %m", _PATH_BSHELL, _PATH_RUNDOWN); _exit(1); /* force single user mode */ |
