From 8d6b83dafab380361480b5930f31165a54642f2b Mon Sep 17 00:00:00 2001 From: dteske Date: Sun, 16 Feb 2014 06:56:44 +0000 Subject: [PATCH] Add zfsboot to the scripted interface of bsdinstall(8); oops! NB: If the zfsboot variables ($ZFSBOOT_*) are set, a script is assumed to want zfsboot module instead of scriptedpart module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Submitted by: Loïc Brarda Reviewed by: nwhitehorn@ MFC after: 3 days --- usr.sbin/bsdinstall/scripts/script | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script index 2915391d61a5..e302ebcdce44 100755 --- a/usr.sbin/bsdinstall/scripts/script +++ b/usr.sbin/bsdinstall/scripts/script @@ -95,7 +95,11 @@ fi # Make partitions rm -f $PATH_FSTAB touch $PATH_FSTAB -bsdinstall scriptedpart "$PARTITIONS" +if [ "$ZFSBOOT_DISKS" ]; then + bsdinstall zfsboot +else + bsdinstall scriptedpart "$PARTITIONS" +fi bsdinstall mount # Unpack distributions