diff options
| author | dteske <dteske@FreeBSD.org> | 2013-12-04 16:06:23 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2013-12-04 16:06:23 +0000 |
| commit | 0526a84d7367e88aadb9418dc3c08b9111f3df5c (patch) | |
| tree | 509f93d3ac76984395a54dc4a74b08457e6bd140 /usr.sbin | |
| parent | bcdcb7df675435bd9c1bf32e9f82e645958d9460 (diff) | |
| download | FreeBSD-src-0526a84d7367e88aadb9418dc3c08b9111f3df5c.zip FreeBSD-src-0526a84d7367e88aadb9418dc3c08b9111f3df5c.tar.gz | |
Fix a regression introduced by SVN r257842 that prevents Encryption from
being enabled.
MFC after: 3 days
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/zfsboot | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 2248a0d..90d6240 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -961,7 +961,7 @@ zfs_create_boot() # If encryption is enabled, we need to create the GEOMs # if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then - local bootvdev= + local bootvdev= options= local geli_pool="$BSDINSTALL_CHROOT/$ZFSBOOT_GELI_POOL_NAME" local key="$ZFSBOOT_GELI_KEY_FILE" @@ -978,11 +978,13 @@ zfs_create_boot() f_dprintf "$funcname: %s %s %s" \ "ZFSBOOT_GELI_POOL_NAME=[$ZFSBOOT_GELI_POOL_NAME]" \ "bootvdev=[$bootvdev]" "unenc_list=[$unenc_list]" + options="-o altroot=\"\$BSDINSTALL_CHROOT\"" + options="$options -m \"/\$ZFSBOOT_GELI_POOL_NAME\"" + options="$options -f" f_eval_catch $funcname zpool "$ZPOOL_CREATE_WITH_OPTIONS" \ - "-o altroot=\"\$BSDINSTALL_CHROOT\" - -m \"/\$ZFSBOOT_GELI_POOL_NAME\" -f" \ - \$ZFSBOOT_GELI_POOL_NAME \$bootvdev \ + "$options" \$ZFSBOOT_GELI_POOL_NAME \$bootvdev \ \$unenc_list || return $FAILURE + f_dprintf "$funcname: geli_pool=[%s]" "$geli_pool" f_eval_catch $funcname mkdir "$MKDIR_P" \$geli_pool/boot || return $FAILURE |
