Browse Source

pull in rc.conf early so that pf(1) startup is right; tested by jasoni, comments from millert

OPENBSD_3_0
deraadt 23 years ago
parent
commit
1e7ff0c0ba
2 changed files with 5 additions and 5 deletions
  1. +1
    -4
      src/etc/netstart
  2. +4
    -1
      src/etc/rc

+ 1
- 4
src/etc/netstart View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/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 # Returns true if $1 contains only alphanumerics
isalphanumeric() { isalphanumeric() {
@ -24,9 +24,6 @@ if [ -f /etc/defaultdomain ]; then
domainname `cat /etc/defaultdomain` domainname `cat /etc/defaultdomain`
fi fi
# pick up option configuration
. /etc/rc.conf
# set the address for the loopback interface # set the address for the loopback interface
# it will also initialize IPv6 address for lo0 (::1 and others). # it will also initialize IPv6 address for lo0 (::1 and others).
ifconfig lo0 inet localhost ifconfig lo0 inet localhost


+ 4
- 1
src/etc/rc View File

@ -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 # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -109,6 +109,9 @@ mount -a -t nonfs
mount -uw / # root on nfs requires this, others aren't hurt mount -uw / # root on nfs requires this, others aren't hurt
rm -f /fastboot # XXX (root now writeable) 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) # set flags on ttys. (do early, in case they use tty for SLIP in netstart)
echo 'setting tty flags' echo 'setting tty flags'
ttyflags -a ttyflags -a


Loading…
Cancel
Save