diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2019-10-02 13:30:17 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2019-10-02 13:30:17 +0000 |
| commit | 8cdae52ef6d091bee9c9545af671011e5e483fb7 (patch) | |
| tree | a043e95e29373bce31c72efb060c60318a6daa83 | |
| parent | 0da4b4089c2432df878d507b466c3965f34eec7a (diff) | |
| download | src-8cdae52ef6d091bee9c9545af671011e5e483fb7.tar.gz src-8cdae52ef6d091bee9c9545af671011e5e483fb7.zip | |
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.
PR: 240478
MFC after: 3 days
Sponsored by: Rubicon Communications, LLC (Netgate)
Notes
Notes:
svn path=/head/; revision=353004
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr.sbin/bsdinstall/scripts/config b/usr.sbin/bsdinstall/scripts/config index d2abb5671fcb..2dcf67408ce3 100755 --- a/usr.sbin/bsdinstall/scripts/config +++ b/usr.sbin/bsdinstall/scripts/config @@ -44,6 +44,7 @@ cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf rm $BSDINSTALL_TMPBOOT/loader.conf.* +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 |