d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out the previous commit, since there could be dire consequences if

Browse Source 
/etc/rc were accidentally executed (as requested by other committeers).
This commit is contained in:
Brian Feldman 2002-12-17 21:23:36 +00:00
parent 54d85f9100
commit f45a1cab59
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=108002
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/Makefile
View File

@ -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

4
sbin/init/init.c
View File

@ -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 */