move std stuff from rc.local to rc

3 files changed, 41 insertions, 37 deletions

diff --git a/etc/netstart b/etc/netstart
index cbb22872e53..0fbcb0545b5 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: netstart,v 1.7 1996/06/16 12:57:31 deraadt Exp $
+#	$OpenBSD: netstart,v 1.8 1996/06/18 15:30:02 deraadt Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=-q
@@ -106,7 +106,7 @@ ifconfig lo0 inet localhost
 
 # use loopback, not the wire
 route add $hostname localhost
-route add -net 127 127.1 -reject
+route add -net 127 127.0.0.1 -reject
 
 # default multicast route
 route add -net 224 -interface $hostname
diff --git a/etc/rc b/etc/rc
index b8537d57e63..92dcd4aea0c 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.16 1996/06/12 09:13:20 deraadt Exp $
+#	$OpenBSD: rc,v 1.17 1996/06/18 15:30:01 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -17,16 +17,13 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 export PATH
 
 # Configure ccd devices.
-if [ -f /etc/ccd.conf ]
-then
+if [ -f /etc/ccd.conf ]; then
 	ccdconfig -C
 fi
 
-if [ -e /fastboot ]
-then
+if [ -e /fastboot ]; then
 	echo "Fast boot: skipping disk checks."
-elif [ $1x = autobootx ]
-then
+elif [ $1x = autobootx ]; then
 	echo "Automatic boot in progress: starting file system checks."
 	fsck -p
 	case $? in
@@ -173,8 +170,7 @@ dev_mkdb
 chmod 666 /dev/tty[pqrs]*
 
 # check the password temp/lock file
-if [ -f /etc/ptmp ]
-then
+if [ -f /etc/ptmp ]; then
 	logger -s -p auth.err \
 	'password file may be incorrect -- /etc/ptmp exists'
 fi
@@ -267,11 +263,33 @@ fi
 
 echo '.'
 
-. /etc/rc.local
-
 if [ -f /sbin/kbd -a -f /etc/kbdtype ]; then
 	kbd `cat /etc/kbdtype`
 fi
 
+# patch /etc/motd
+if [ ! -f /etc/motd ]; then
+	install -c -o root -g wheel -m 664 /dev/null /etc/motd
+fi
+T=/tmp/_motd
+rm -f $T
+sysctl -n kern.version | sed 1q > $T
+echo "" >> $T
+sed '1,/^$/d' < /etc/motd >> $T
+cmp -s $T /etc/motd || cp $T /etc/motd
+rm -f $T
+
+if [ -f /sbin/ldconfig ]; then
+	echo 'creating runtime link editor directory cache.'
+	ldconfig /usr/X11R6/lib
+fi 
+
+# Kerberos runs ONLY on the Kerberos server machine
+if [ X${kerberos_server} = X"YES" ]; then
+	echo 'kerberos server';	kerberos >> /var/log/kerberos.log &
+fi
+
+. /etc/rc.local
+
 date
 exit 0
diff --git a/etc/rc.local b/etc/rc.local
index d2e2dd3e34f..364d46a490d 100644
--- a/etc/rc.local
+++ b/etc/rc.local
@@ -1,30 +1,16 @@
-#
-# site-specific startup actions, daemons
-#
-#	$OpenBSD: rc.local,v 1.3 1996/05/26 10:49:40 deraadt Exp $
-#
-
-if [ ! -f /etc/motd ]; then
-	install -c -o root -g wheel -m 664 /dev/null /etc/motd
-fi
-T=/tmp/_motd
-rm -f $T
-sysctl -n kern.version | sed 1q > $T
-echo "" >> $T
-sed '1,/^$/d' < /etc/motd >> $T
-cmp -s $T /etc/motd || cp $T /etc/motd
-rm -f $T
+#	$OpenBSD: rc.local,v 1.4 1996/06/18 15:30:02 deraadt Exp $
 
-if [ -f /sbin/ldconfig ]; then
-	echo 'creating runtime link editor directory cache.'
-	ldconfig /usr/X11R6/lib
-fi 
+# site-specific startup actions, daemons
+# Add your local changes additions to this file
 
 echo -n 'starting local daemons:'
 
-# Kerberos runs ONLY on the Kerberos server machine
-if [ X${kerberos_server} = X"YES" ]; then
-	echo -n ' kerberos';	kerberos >> /var/log/kerberos.log &
-fi
+#if [ -f /usr/local/etc/httpd/http ]; then
+#	echo -n ' httpd';	/usr/local/etc/httpd/httpd
+#fi
+
+#if [ -f /usr/local/sbin/sshd ]; then
+#	echo -n ' sshd';	/usr/local/sbin/sshd
+#fi
 
 echo '.'