If /conf/diskless_remount exists, use it to remount the entire /conf

directory.  This allows multiple roots (say for different architectures)
to share the same set of /conf files.
This commit is contained in:
Brooks Davis 2004-03-12 04:40:16 +00:00
parent 7698f25ac3
commit 14b34e45f8
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=126868
2 changed files with 26 additions and 4 deletions

View file

@ -81,8 +81,8 @@
# /conf/default/etc/{rc.conf,rc.local,fstab}. Your fstab should be sure
# to mount a /usr... typically an NFS readonly /usr.
#
# NOTE! /etc/rc.d/diskless will create /var, /tmp, and /dev.
# Those filesystems should not be specified in /conf. At least not yet.
# NOTE! /var, /tmp, and /dev will be created elsewhere.
# Those filesystems should not be specified in /conf.
dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
[ ${dlv:=0} -eq 0 ] && [ ! -f /etc/diskless ] && exit 0
@ -167,6 +167,17 @@ while [ $# -ge 1 ] ; do
shift
done
# If /conf/diskless_remount exists, remount all of /conf. This allows
# multiple roots to share the same conf files.
if [ -d /conf -a -f /conf/diskless_remount ]; then
nfspt=`/bin/cat /conf/diskless_remount`
if [ `expr "$nfspt" : '\(.\)'` = "/" ]; then
nfspt="${nfsroot}${nfspt}"
fi
mount_nfs $nfspt /conf
chkerr $? "mount_nfs $nfspt /conf"
fi
# Resolve templates in /conf/base, /conf/default, /conf/${bootp_ipbca},
# and /conf/${bootp_ipa}. For each subdirectory found within these
# directories:

View file

@ -81,8 +81,8 @@
# /conf/default/etc/{rc.conf,rc.local,fstab}. Your fstab should be sure
# to mount a /usr... typically an NFS readonly /usr.
#
# NOTE! /etc/rc.d/diskless will create /var, /tmp, and /dev.
# Those filesystems should not be specified in /conf. At least not yet.
# NOTE! /var, /tmp, and /dev will be created elsewhere.
# Those filesystems should not be specified in /conf.
dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
[ ${dlv:=0} -eq 0 ] && [ ! -f /etc/diskless ] && exit 0
@ -167,6 +167,17 @@ while [ $# -ge 1 ] ; do
shift
done
# If /conf/diskless_remount exists, remount all of /conf. This allows
# multiple roots to share the same conf files.
if [ -d /conf -a -f /conf/diskless_remount ]; then
nfspt=`/bin/cat /conf/diskless_remount`
if [ `expr "$nfspt" : '\(.\)'` = "/" ]; then
nfspt="${nfsroot}${nfspt}"
fi
mount_nfs $nfspt /conf
chkerr $? "mount_nfs $nfspt /conf"
fi
# Resolve templates in /conf/base, /conf/default, /conf/${bootp_ipbca},
# and /conf/${bootp_ipa}. For each subdirectory found within these
# directories: