Page MenuHomeFreeBSD
Files F145054115

D12534.1777289306.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D12534.1777289306.diff
View Options

Index: usr.sbin/bsdinstall/scripts/zfsboot
===================================================================
--- usr.sbin/bsdinstall/scripts/zfsboot
+++ usr.sbin/bsdinstall/scripts/zfsboot
@@ -1456,6 +1456,25 @@
return $FAILURE
fi
+ if [ "$ZFSBOOT_BOOT_POOL" ]; then
+ # Set cachefile and load zpool.cache 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
+
+ for option in \
+ 'zpool_cache_load=\"YES\"' \
+ 'zpool_cache_type=\"/boot/zfs/zpool.cache\"' \
+ 'zpool_cache_name=\"/boot/zfs/zpool.cache\"' \
+ ; do
+ f_eval_catch $funcname echo "$ECHO_APPEND" "$option" \
+ $BSDINSTALL_TMPBOOT/loader.conf.zfs ||
+ return $FAILURE
+ done
+ fi
+
# We're all done unless we should go on to do encryption
[ "$ZFSBOOT_GELI_ENCRYPTION" ] || return $SUCCESS
@@ -1488,23 +1507,11 @@
return $FAILURE
done
- # 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\"' \
- 'zpool_cache_type=\"/boot/zfs/zpool.cache\"' \
- 'zpool_cache_name=\"/boot/zfs/zpool.cache\"' \
+ f_eval_catch $funcname echo "$ECHO_APPEND" \
'geom_eli_passphrase_prompt=\"YES\"' \
- ; do
- f_eval_catch $funcname echo "$ECHO_APPEND" "$option" \
- $BSDINSTALL_TMPBOOT/loader.conf.zfs ||
- return $FAILURE
- done
+ $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
+
return $SUCCESS
}

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 27, 11:28 AM (5 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28439107
Default Alt Text
D12534.1777289306.diff (1 KB)

Event Timeline