diff options
| author | allanjude <allanjude@FreeBSD.org> | 2016-07-26 05:26:53 +0000 |
|---|---|---|
| committer | allanjude <allanjude@FreeBSD.org> | 2016-07-26 05:26:53 +0000 |
| commit | e004d7b2a6cc8351712016d35e3f4aa5e9930431 (patch) | |
| tree | eafac647baf193d681f9448cf0a37936639f7b3e /usr.sbin/bsdinstall | |
| parent | 5087a345bdf0134386f2dec72a6e80e8cc4c6864 (diff) | |
| download | FreeBSD-src-e004d7b2a6cc8351712016d35e3f4aa5e9930431.zip FreeBSD-src-e004d7b2a6cc8351712016d35e3f4aa5e9930431.tar.gz | |
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.
Diffstat (limited to 'usr.sbin/bsdinstall')
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/zfsboot | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 6424579..9fbf5c9 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -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 |
