svn commit: r364785 - head/usr.sbin/bsdinstall/scripts

[Ryan Moeller]

Author: freqlabs
Date: Tue Aug 25 21:07:27 2020
New Revision: 364785
URL: https://svnweb.freebsd.org/changeset/base/364785

Log:
  bsdinstall: Update loader.conf for new OpenZFS deps
  
  zfs.ko now includes the SPL but relies on cryptodev instead.
  
  Reported by:	D Scott Phillips
  Sponsored by:	iXsystems, Inc.

Modified:
  head/usr.sbin/bsdinstall/scripts/config

Modified: head/usr.sbin/bsdinstall/scripts/config
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/config	Tue Aug 25 20:07:11 2020	(r364784)
+++ head/usr.sbin/bsdinstall/scripts/config	Tue Aug 25 21:07:27 2020	(r364785)
@@ -44,9 +44,9 @@ cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc
 
 cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf
 rm $BSDINSTALL_TMPBOOT/loader.conf.*
-# The 'opensolaris_load' line is a workaround for arm64, which does not
-# automatically load opensolaris.ko with zfs.ko.
-df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "opensolaris_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf
+# The 'cryptodev_load' line is a workaround for arm64, which does not
+# automatically load cryptodev.ko with zfs.ko.
+df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "cryptodev_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf
 df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf
 
 cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot