mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-02-03 17:11:32 +00:00
Code Issues Releases Activity

gjb writes: when doing encrypted zfs install, loader.conf should be updated

Browse Source 
so bootpool is imported after boot:
        zpool_cache_load="YES"
        zpool_cache_type="/boot/zfs/zpool.cache"
        zpool_cache_name="/boot/zfs/zpool.cache"
otherwise /boot is a broken symlink after the system is up.
http://lists.freebsd.org/pipermail/freebsd-fs/2013-July/017891.html
NOTE: Fix a comment while here.

Reviewed by:	gjb
This commit is contained in:
Devin Teske 2013-10-15 14:18:15 +00:00
parent 3329973740
commit 13d8e1cee5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=256540
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/bsdinstall/scripts/zfsboot
View File

@ -802,7 +802,7 @@ zfs_create_boot()
zpool set cachefile=$BSDINSTALL_CHROOT/boot/zfs/zpool.cache \
"$poolname" || return $FAILURE
# Last, but not least... add required lines to rc.conf(5)
# Last, but not least... required lines for rc.conf(5)/loader.conf(5)
# NOTE: We later concatenate these into their destination
echo 'zfs_enable="YES"' > $BSDINSTALL_TMPETC/rc.conf.zfs ||
return $FAILURE
@ -812,6 +812,14 @@ zfs_create_boot()
# We're all done unless we should go on to do encryption
[ "$ZFSBOOT_GELI_ENCRYPTION" ] || return $SUCCESS
# Some additional GELI requirements for loader.conf(5)
echo 'zpool_cache_load="YES"' \
>> $BSDINSTALL_TMPETC/loader.conf.zfs || return $FAILURE
echo 'zpool_cache_type="/boot/zfs/zpool.cache"' \
>> $BSDINSTALL_TMPETC/loader.conf.zfs || return $FAILURE
echo 'zpool_cache_name="/boot/zfs/zpool.cache"' \
>> $BSDINSTALL_TMPETC/loader.conf.zfs || return $FAILURE
#
# Configure geli(8)-based encryption
#