d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a regression introduced by SVN r257842; resulting in mountroot prompt

Browse Source 
after attempting to install to encrypted ZFS root (caused by a typo in a
variable name -- ZFSBOOT_BOOT_FSNAME -> ZFSBOOT_BOOTFS_NAME).

MFC after:	3 days
This commit is contained in:
Devin Teske 2013-12-09 23:58:26 +00:00
parent d419aaa126
commit b75256cfd2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1190,7 +1190,7 @@ zfs_create_boot()
f_eval_catch $funcname echo "$ECHO_APPEND" 'geom_eli_load=\"YES\"' \
\$BSDINSTALL_TMPBOOT/loader.conf.geli || return $FAILURE
f_eval_catch $funcname printf "$PRINTF_CONF" vfs.root.mountfrom \
'"zfs:$poolname/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOT_FSNAME"' \
'"zfs:$poolname/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME"' \
\$BSDINSTALL_TMPBOOT/loader.conf.root || return $FAILURE
f_dprintf "$funcname: disks=[%s]" "$disks"
for disk in $disks; do