Author: dteske
Date: Thu Dec 19 06:43:52 2013
New Revision: 259598
URL: http://svnweb.freebsd.org/changeset/base/259598
Log:
When using a bootpool, set the cachefile property so that it gets
imported automatically upon reboot to the newly installed system.
MFC after: 1 day
Modified:
head/usr.sbin/bsdinstall/scripts/zfsboot
Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot Thu Dec 19 06:41:30 2013
(r259597)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot Thu Dec 19 06:43:52 2013
(r259598)
@@ -1152,7 +1152,7 @@ zfs_create_boot()
fi
# While this is apparently not needed, it seems to help MBR
- f_dprintf "$funcname: Configuring zpool.cache..."
+ f_dprintf "$funcname: Configuring zpool.cache for zroot..."
f_eval_catch $funcname mkdir "$MKDIR_P" $BSDINSTALL_CHROOT/boot/zfs ||
return $FAILURE
f_eval_catch $funcname zpool "$ZPOOL_SET" \
@@ -1174,6 +1174,12 @@ zfs_create_boot()
# We're all done unless we should go on for boot pool
[ "$ZFSBOOT_BOOT_POOL" ] || return $SUCCESS
+ # Set cachefile for boot pool so it auto-imports at system start
+ f_dprintf "$funcname: Configuring zpool.cache for boot pool..."
+ f_eval_catch $funcname zpool "$ZPOOL_SET" \
+ "cachefile=\"$BSDINSTALL_CHROOT/boot/zfs/zpool.cache\"" \
+ "$bootpool_name" || return $FAILURE
+
# Some additional geli(8) requirements for loader.conf(5)
for option in \
'zpool_cache_load=\"YES\"' \
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
