d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the order in which /etc files are copied into place; copy

Browse Source 
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.
This commit is contained in:
bsd 2001-04-03 00:24:01 +00:00
parent e6934cff4f
commit ff5a4726b6
3 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etc/rc.d/initdiskless
View File

@ -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

17
etc/rc.diskless1
View File

@ -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

17
etc/rc.initdiskless
View File

@ -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