Update bsdinstall to handle the new nozfs flavor, and the

change from sysutils/zol -> sysutils/openzfs
maxsteciuk · Jun 11, 2019 · 1e19576 · 1e19576
1 parent 41dd571
commit 1e19576
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
@@ -213,7 +213,8 @@ fi
 PFLAVORS="\
 generic \"Default options and features\" \
 minimal \"Less userland features\" \
-zol \"Using sysutils/zol as the default ZFS\""
+nozfs \"World/Kernel built without ZFS\" \
+openzfs \"Use sysutils/openzfs as the default ZFS\""
 
 exec 3>&1
 OSFLAVOR=`echo $PFLAVORS | xargs dialog --backtitle "FreeBSD Installer" \
@@ -223,7 +224,10 @@ OSFLAVOR=`echo $PFLAVORS | xargs dialog --backtitle "FreeBSD Installer" \
 exec 3>&-
 
 case "$OSFLAVOR" in
-generic|minimal|zol) ;;
+generic|minimal|nozfs) ;;
+openzfs) OSFLAVOR="nozfs"
+	 EXTRAPKGS="openzfs"
+	;;
 *)
 	error "Unknown OS flavor"
 	;;
@@ -280,7 +284,7 @@ case "$PARTMODE" in
 esac
 
 # Install base packages
-pkg -r $BSDINSTALL_CHROOT install -y os-${OSFLAVOR}-userland os-${OSFLAVOR}-kernel pkg ca_root_nss || error "Failed package base installation!"
+pkg -r $BSDINSTALL_CHROOT install -y os-${OSFLAVOR}-userland os-${OSFLAVOR}-kernel pkg ca_root_nss ${EXTRAPKGS} || error "Failed package base installation!"
 
 # Set up boot loader
 bsdinstall bootconfig || error "Failed to configure bootloader"

diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -186,8 +186,8 @@ FSTAB_FMT="%s\t\t%s\t%s\t%s\t\t%s\t%s\n"
 # Check which version of ZFS to use
 #
 case $OSFLAVOR in
-	zol)
-		kldload /boot/modules/zfs.ko
+	nozfs)
+		kldload /boot/modules/openzfs.ko
 		ZFS="/usr/local/sbin/zfs"
 		ZPOOL="/usr/local/sbin/zpool"
 		;;