From 2ea2c1f6d8a5db9920d77d8318d30ac930510724 Mon Sep 17 00:00:00 2001
From: bsd <bsd@FreeBSD.org>
Date: Tue, 3 Apr 2001 00:24:01 +0000
Subject: Change the order in which /etc files are copied into place; copy
 default first, then network-specific files, then host-specific files. I think
 this was the original intent, as Matt indicated the previous code appeared to
 be a bug.

---
 etc/rc.initdiskless | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'etc/rc.initdiskless')

diff --git a/etc/rc.initdiskless b/etc/rc.initdiskless
index 80ca2ce..54ee15a 100644
--- a/etc/rc.initdiskless
+++ b/etc/rc.initdiskless
@@ -102,12 +102,19 @@ mount_mfs -s 2048 -T qp120at dummy /conf/etc
 cp -Rp /etc/* /conf/etc
 chkerr $? "MFS mount on /conf/etc"
 
+# Pick up default, network-specific, and host-specific config, in that
+# order
+
+if [ -d /conf/default/etc/ ]; then
+	cp -Rp /conf/default/etc/* /conf/etc
+fi
+
+if [ -d /conf/${bootp_ipbca} ] ; then
+	cp -Rp /conf/${bootp_ipbca}/etc/* /conf/etc
+fi
+
 if [ -d /conf/${bootp_ipa} ] ; then
-        cp -Rp /conf/${bootp_ipa}/etc/* /conf/etc
-elif [ -d /conf/${bootp_ipbca} ] ; then
-        cp -Rp /conf/${bootp_ipbca}/etc/* /conf/etc
-else
-        cp -Rp /conf/default/etc/* /conf/etc
+	cp -Rp /conf/${bootp_ipa}/etc/* /conf/etc
 fi
 
 # Make the new directory available as /etc
-- 
cgit v1.1