svn commit: r353048 - releng/12.1/usr.sbin/bsdinstall/scripts
Glen Barber
gjb at FreeBSD.org
Thu Oct 3 14:41:21 UTC 2019
Author: gjb
Date: Thu Oct 3 14:41:20 2019
New Revision: 353048
URL: https://svnweb.freebsd.org/changeset/base/353048
Log:
MFS12 r353047:
MFC r353004, r353012:
r353004:
Explicitly add opensolaris_load="YES" to loader.conf through the
installer when installing the system on a ZFS root filesystem.
For arm64, zfs_load="YES" does not add opensolaris.ko as a kld
dependency, so add it explicitly to prevent boot-time failures
out-of-box.
r353012:
Add a comment explaining why the opensolaris_load line in loader.conf
is explicitly added.
PR: 240478
Approved by: re (kib)
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
releng/12.1/usr.sbin/bsdinstall/scripts/config
Directory Properties:
releng/12.1/ (props changed)
Modified: releng/12.1/usr.sbin/bsdinstall/scripts/config
==============================================================================
--- releng/12.1/usr.sbin/bsdinstall/scripts/config Thu Oct 3 14:39:15 2019 (r353047)
+++ releng/12.1/usr.sbin/bsdinstall/scripts/config Thu Oct 3 14:41:20 2019 (r353048)
@@ -44,6 +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
df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf
cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot
More information about the svn-src-all
mailing list