summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/netstart5
-rw-r--r--etc/rc5
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/netstart b/etc/netstart
index 7cef40fc9ff..ad10a0f96f4 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: netstart,v 1.78 2001/05/30 02:11:08 deraadt Exp $
+# $OpenBSD: netstart,v 1.79 2001/07/03 03:28:19 deraadt Exp $
# Returns true if $1 contains only alphanumerics
isalphanumeric() {
@@ -24,9 +24,6 @@ if [ -f /etc/defaultdomain ]; then
domainname `cat /etc/defaultdomain`
fi
-# pick up option configuration
-. /etc/rc.conf
-
# set the address for the loopback interface
# it will also initialize IPv6 address for lo0 (::1 and others).
ifconfig lo0 inet localhost
diff --git a/etc/rc b/etc/rc
index 19c5c8ff4a3..39508df3071 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.176 2001/07/01 08:38:59 kjell Exp $
+# $OpenBSD: rc,v 1.177 2001/07/03 03:28:19 deraadt Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -109,6 +109,9 @@ mount -a -t nonfs
mount -uw / # root on nfs requires this, others aren't hurt
rm -f /fastboot # XXX (root now writeable)
+# pick up option configuration
+. /etc/rc.conf
+
# set flags on ttys. (do early, in case they use tty for SLIP in netstart)
echo 'setting tty flags'
ttyflags -a