diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-10-07 16:36:27 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-10-07 16:36:27 +0000 |
| commit | 6a23c1b6a9f7b5f85e35f156f1c09f787321b8c2 (patch) | |
| tree | 08ebfef177e02c8d05ff20f9346c126748684586 | |
| parent | 1706a0112c859f2f3198968c769b04015f0e6baa (diff) | |
The new ypbind changes requires that the domainname be set before
rc.conf is run. There's no real downside.
ok aja
| -rw-r--r-- | etc/netstart | 6 | ||||
| -rw-r--r-- | etc/rc | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/etc/netstart b/etc/netstart index fa9ab632e2f..609ad69e036 100644 --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/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) # from a file and spew to stdout @@ -195,10 +195,6 @@ else hostname=`hostname` fi -if [ -f /etc/defaultdomain ]; then - domainname `stripcom /etc/defaultdomain` -fi - # Set the address for the loopback interface. Bringing the interface up, # automatically invokes the IPv6 address ::1. ifconfig lo0 inet 127.0.0.1/8 @@ -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 # or after single-user. @@ -221,6 +221,11 @@ INRC=1; export INRC PATH=/sbin:/bin:/usr/sbin:/usr/bin 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 . /etc/rc.conf |