Author: allanjude
Date: Tue Jul 26 05:26:53 2016
New Revision: 303331
URL: https://svnweb.freebsd.org/changeset/base/303331
Log:
MFC: r302940
Fix error in bsdinstall triggered when doing a GELI encrypted install to
an MBR formatted disk
Approved by: re (gjb)
Sponsored by: ScaleEngine Inc.
Modified:
stable/11/usr.sbin/bsdinstall/scripts/zfsboot
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- stable/11/usr.sbin/bsdinstall/scripts/zfsboot Tue Jul 26 05:26:07
2016 (r303330)
+++ stable/11/usr.sbin/bsdinstall/scripts/zfsboot Tue Jul 26 05:26:53
2016 (r303331)
@@ -1393,8 +1393,9 @@ zfs_create_boot()
"-o altroot=\"$BSDINSTALL_CHROOT\"" "$zroot_name"
||
return $FAILURE
if [ "$ZFSBOOT_BOOT_POOL" ]; then
+ # Import the bootpool, but do not mount it yet
f_eval_catch $funcname zpool
"$ZPOOL_IMPORT_WITH_OPTIONS" \
- "-o altroot=\"$BSDINSTALL_CHROOT\"" \
+ "-o altroot=\"$BSDINSTALL_CHROOT\" -N" \
"$bootpool_name" || return $FAILURE
fi
fi
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
