summaryrefslogtreecommitdiff
path: root/etc/rc
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-10-07 16:36:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-10-07 16:36:27 +0000
commit6a23c1b6a9f7b5f85e35f156f1c09f787321b8c2 (patch)
tree08ebfef177e02c8d05ff20f9346c126748684586 /etc/rc
parent1706a0112c859f2f3198968c769b04015f0e6baa (diff)
The new ypbind changes requires that the domainname be set before
rc.conf is run. There's no real downside. ok aja
Diffstat (limited to 'etc/rc')
-rw-r--r--etc/rc7
1 files changed, 6 insertions, 1 deletions
diff --git a/etc/rc b/etc/rc
index 0a4ea56d4e5..79873469423 100644
--- a/etc/rc
+++ b/etc/rc
@@ -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