=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v retrieving revision 1.125 retrieving revision 1.126 diff -c -r1.125 -r1.126 *** src/etc/rc 1999/11/23 02:20:14 1.125 --- src/etc/rc 2000/01/01 22:45:35 1.126 *************** *** 1,4 **** ! # $OpenBSD: rc,v 1.125 1999/11/23 02:20:14 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. --- 1,4 ---- ! # $OpenBSD: rc,v 1.126 2000/01/01 22:45:35 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. *************** *** 105,110 **** --- 105,121 ---- > /dev/null 2>&1 fi + if [ -f /etc/sysctl.conf ]; then + ( + # delete comments and blank lines + set -- `sed -e 's/#.*$//' /etc/sysctl.conf | grep -v '^$'` + while [ $# -ge 1 ] ; do + sysctl -w $1 + shift 1 + done + ) + fi + # set hostname, turn on network echo 'starting network' . /etc/netstart *************** *** 297,313 **** (cd /tmp && rm -rf [a-km-pr-zA-Z]* && find . ! -name . ! -name lost+found ! -name quota.user \ ! -name quota.group -execdir rm -rf -- {} \; -type d -prune) - - if [ -f /etc/sysctl.conf ]; then - ( - # delete comments and blank lines - set -- `sed -e 's/#.*$//' /etc/sysctl.conf | grep -v '^$'` - while [ $# -ge 1 ] ; do - sysctl -w $1 - shift 1 - done - ) - fi [ -f /etc/rc.securelevel ] && . /etc/rc.securelevel if [ X${securelevel} != X"" ]; then --- 308,313 ----