diff options
| author | bsd <bsd@FreeBSD.org> | 2001-04-03 00:24:01 +0000 |
|---|---|---|
| committer | bsd <bsd@FreeBSD.org> | 2001-04-03 00:24:01 +0000 |
| commit | 2ea2c1f6d8a5db9920d77d8318d30ac930510724 (patch) | |
| tree | 46434ab909376d6d1f4a05695d90d295388fce76 /etc/rc.d/initdiskless | |
| parent | 0cb21beb36f56e99d87e795fc9c292f5b7f6aed7 (diff) | |
| download | FreeBSD-src-2ea2c1f6d8a5db9920d77d8318d30ac930510724.zip FreeBSD-src-2ea2c1f6d8a5db9920d77d8318d30ac930510724.tar.gz | |
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.
Diffstat (limited to 'etc/rc.d/initdiskless')
| -rw-r--r-- | etc/rc.d/initdiskless | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/etc/rc.d/initdiskless b/etc/rc.d/initdiskless index 80ca2ce..54ee15a 100644 --- a/etc/rc.d/initdiskless +++ b/etc/rc.d/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 |
