From 13d8e1cee577b01146c39041574e338d4912dd46 Mon Sep 17 00:00:00 2001 From: Devin Teske Date: Tue, 15 Oct 2013 14:18:15 +0000 Subject: [PATCH] gjb writes: when doing encrypted zfs install, loader.conf should be updated 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 --- usr.sbin/bsdinstall/scripts/zfsboot | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 715ea31b1175..289671349920 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -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 #