diff options
| author | smh <smh@FreeBSD.org> | 2015-01-18 18:25:12 +0000 |
|---|---|---|
| committer | smh <smh@FreeBSD.org> | 2015-01-18 18:25:12 +0000 |
| commit | 1ac50c4c33db8aa0a2923a7f2a0e25cbdee3a40b (patch) | |
| tree | 1eaec6a2016105156685c1b09a42441b1a494ccc /usr.sbin | |
| parent | f1c9d3f332580379ca3a231c238944ef36934596 (diff) | |
| download | FreeBSD-src-1ac50c4c33db8aa0a2923a7f2a0e25cbdee3a40b.zip FreeBSD-src-1ac50c4c33db8aa0a2923a7f2a0e25cbdee3a40b.tar.gz | |
Fix bsdinstall when working with geli boot disks
PR: 196790
Differential Revision: https://reviews.freebsd.org/D566
Submitted by: Michael Gmelin <grembo@FreeBSD.org>
MFC after: 2 weeks
Sponsored by: Multiplay
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/zfsboot | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 673961a..5bdf94f 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -1077,6 +1077,9 @@ zfs_create_boot() boot_vdevs="$boot_vdevs $disk$bootpart" fi zroot_vdevs="$zroot_vdevs $disk$targetpart" + if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then + zroot_vdevs="$zroot_vdevs.eli" + fi n=$(( $n + 1 )) done # disks |
