Browse Source

The new ypbind changes requires that the domainname be set before

rc.conf is run.  There's no real downside.
ok aja
OPENBSD_5_1
deraadt 13 years ago
parent
commit
e73b0d38a5
2 changed files with 7 additions and 6 deletions
  1. +1
    -5
      src/etc/netstart
  2. +6
    -1
      src/etc/rc

+ 1
- 5
src/etc/netstart View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: netstart,v 1.133 2011/07/07 23:09:46 guenther Exp $
# $OpenBSD: netstart,v 1.134 2011/10/07 16:36:26 deraadt Exp $
# Strip comments (and leading/trailing whitespace if IFS is set) # Strip comments (and leading/trailing whitespace if IFS is set)
# from a file and spew to stdout # from a file and spew to stdout
@ -195,10 +195,6 @@ else
hostname=`hostname` hostname=`hostname`
fi fi
if [ -f /etc/defaultdomain ]; then
domainname `stripcom /etc/defaultdomain`
fi
# Set the address for the loopback interface. Bringing the interface up, # Set the address for the loopback interface. Bringing the interface up,
# automatically invokes the IPv6 address ::1. # automatically invokes the IPv6 address ::1.
ifconfig lo0 inet 127.0.0.1/8 ifconfig lo0 inet 127.0.0.1/8


+ 6
- 1
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.394 2011/10/06 20:49:25 deraadt Exp $
# $OpenBSD: rc,v 1.395 2011/10/07 16:36:26 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.
@ -221,6 +221,11 @@ INRC=1; export INRC
PATH=/sbin:/bin:/usr/sbin:/usr/bin PATH=/sbin:/bin:/usr/sbin:/usr/bin
export PATH export PATH
# must set the domainname before rc.conf, so YP startup choices can be made
if [ -f /etc/defaultdomain ]; then
domainname `stripcom /etc/defaultdomain`
fi
# pick up option configuration # pick up option configuration
. /etc/rc.conf . /etc/rc.conf


Loading…
Cancel
Save