Date: Sun, 18 Jan 2015 18:25:13 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277333 - head/usr.sbin/bsdinstall/scripts Message-ID: <201501181825.t0IIPDti075819@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: smh Date: Sun Jan 18 18:25:12 2015 New Revision: 277333 URL: https://svnweb.freebsd.org/changeset/base/277333 Log: 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 Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot ============================================================================== --- head/usr.sbin/bsdinstall/scripts/zfsboot Sun Jan 18 18:11:54 2015 (r277332) +++ head/usr.sbin/bsdinstall/scripts/zfsboot Sun Jan 18 18:25:12 2015 (r277333) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501181825.t0IIPDti075819>