svn commit: r353047 - in stable: 11/usr.sbin/bsdinstall/scripts 12/usr.sbin/bsdinstall/scripts

[Glen Barber]

Author: gjb
Date: Thu Oct  3 14:39:15 2019
New Revision: 353047
URL: https://svnweb.freebsd.org/changeset/base/353047

Log:
  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, early MFC)
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  stable/11/usr.sbin/bsdinstall/scripts/config
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/usr.sbin/bsdinstall/scripts/config
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/usr.sbin/bsdinstall/scripts/config
==============================================================================
--- stable/11/usr.sbin/bsdinstall/scripts/config	Thu Oct  3 14:27:04 2019	(r353046)
+++ stable/11/usr.sbin/bsdinstall/scripts/config	Thu Oct  3 14:39:15 2019	(r353047)
@@ -39,6 +39,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