OS
/
automount
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3 from bdrewery/loader-conf-local 

Also consider /boot/loader.conf.local when updating vfs.root.mountfrom
This commit is contained in:
vermaden 2012-04-29 09:06:22 -07:00
parent 347990888c c1626f0e9d
commit 7b3b9dbd4d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beadm
View File

@ -152,7 +152,9 @@ case ${1} in
} }
zfs set mountpoint=${MNT} ${POOL}/ROOT/${2} zfs set mountpoint=${MNT} ${POOL}/ROOT/${2}
cp /boot/zfs/zpool.cache ${MNT}/boot/zfs/zpool.cache cp /boot/zfs/zpool.cache ${MNT}/boot/zfs/zpool.cache
sed -i '' -E s/"^vfs.root.mountfrom=.*$"/"vfs.root.mountfrom=\"zfs:${POOL}\/ROOT\/${2##*/}\""/g ${MNT}/boot/loader.conf LOADER_CONFIGS=${MNT}/boot/loader.conf
[ -f ${MNT}/boot/loader.conf.local ] && LOADER_CONFIGS="${LOADER_CONFIGS} ${MNT}/boot/loader.conf.local"
sed -i '' -E s/"^vfs.root.mountfrom=.*$"/"vfs.root.mountfrom=\"zfs:${POOL}\/ROOT\/${2##*/}\""/g ${LOADER_CONFIGS}
zfs set mountpoint=legacy ${POOL}/ROOT/${2} zfs set mountpoint=legacy ${POOL}/ROOT/${2}
} }
zpool set bootfs=${POOL}/ROOT/${2} ${POOL} && { zpool set bootfs=${POOL}/ROOT/${2} ${POOL} && {