aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Moeller <freqlabs@FreeBSD.org>2020-08-25 21:07:27 +0000
committerRyan Moeller <freqlabs@FreeBSD.org>2020-08-25 21:07:27 +0000
commit60403b98b907a7f80016de24e1770e323c3dcdbb (patch)
treedb7660ce56ae1d1a3b0ea732a032487c34d7f7c0
parentcc0b8830287282c96e26cd826383dc4794eb1268 (diff)
downloadsrc-60403b98b907a7f80016de24e1770e323c3dcdbb.tar.gz
src-60403b98b907a7f80016de24e1770e323c3dcdbb.zip
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.
Notes
Notes: svn path=/head/; revision=364785
-rwxr-xr-xusr.sbin/bsdinstall/scripts/config6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/bsdinstall/scripts/config b/usr.sbin/bsdinstall/scripts/config
index 5b3ef996251a..af4dacd2b679 100755
--- a/usr.sbin/bsdinstall/scripts/config
+++ b/usr.sbin/bsdinstall/scripts/config
@@ -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