Author: ian
Date: Wed Apr 24 23:52:38 2019
New Revision: 346653
URL: https://svnweb.freebsd.org/changeset/base/346653
Log:
The zfs module has grown a dependency on zcl_nfs4.ko, so copy it into all
the test images.
Modified:
head/tools/boot/rootgen.sh
Modified: head/tools/boot/rootgen.sh
==============================================================================
--- head/tools/boot/rootgen.sh Wed Apr 24 23:51:12 2019 (r346652)
+++ head/tools/boot/rootgen.sh Wed Apr 24 23:52:38 2019 (r346653)
@@ -110,6 +110,7 @@ mk_nogeli_gpt_zfs_legacy() {
zfs_load=YES
opensolaris_load=YES
EOF
+ cp /boot/kernel/acl_nfs4.ko ${mntpt}/boot/kernel/acl_nfs4.ko
cp /boot/kernel/zfs.ko ${mntpt}/boot/kernel/zfs.ko
cp /boot/kernel/opensolaris.ko ${mntpt}/boot/kernel/opensolaris.ko
# end tweaks
@@ -148,6 +149,7 @@ mk_nogeli_gpt_zfs_uefi() {
zfs_load=YES
opensolaris_load=YES
EOF
+ cp /boot/kernel/acl_nfs4.ko ${mntpt}/boot/kernel/acl_nfs4.ko
cp /boot/kernel/zfs.ko ${mntpt}/boot/kernel/zfs.ko
cp /boot/kernel/opensolaris.ko ${mntpt}/boot/kernel/opensolaris.ko
# end tweaks
@@ -187,6 +189,7 @@ mk_nogeli_gpt_zfs_both() {
zfs_load=YES
opensolaris_load=YES
EOF
+ cp /boot/kernel/acl_nfs4.ko ${mntpt}/boot/kernel/acl_nfs4.ko
cp /boot/kernel/zfs.ko ${mntpt}/boot/kernel/zfs.ko
cp /boot/kernel/opensolaris.ko ${mntpt}/boot/kernel/opensolaris.ko
# end tweaks
@@ -268,6 +271,7 @@ mk_nogeli_mbr_zfs_legacy() {
zfs_load=YES
opensolaris_load=YES
EOF
+ cp /boot/kernel/acl_nfs4.ko ${mntpt}/boot/kernel/acl_nfs4.ko
cp /boot/kernel/zfs.ko ${mntpt}/boot/kernel/zfs.ko
cp /boot/kernel/opensolaris.ko ${mntpt}/boot/kernel/opensolaris.ko
# end tweaks
@@ -309,6 +313,7 @@ mk_nogeli_mbr_zfs_uefi() {
zfs_load=YES
opensolaris_load=YES
EOF
+ cp /boot/kernel/acl_nfs4.ko ${mntpt}/boot/kernel/acl_nfs4.ko
cp /boot/kernel/zfs.ko ${mntpt}/boot/kernel/zfs.ko
cp /boot/kernel/opensolaris.ko ${mntpt}/boot/kernel/opensolaris.ko
# end tweaks
@@ -350,6 +355,7 @@ mk_nogeli_mbr_zfs_both() {
zfs_load=YES
opensolaris_load=YES
EOF
+ cp /boot/kernel/acl_nfs4.ko ${mntpt}/boot/kernel/acl_nfs4.ko
cp /boot/kernel/zfs.ko ${mntpt}/boot/kernel/zfs.ko
cp /boot/kernel/opensolaris.ko ${mntpt}/boot/kernel/opensolaris.ko
# end tweaks
@@ -500,6 +506,7 @@ zfs_load=YES
opensolaris_load=YES
geom_eli_load=YES
EOF
+ cp /boot/kernel/acl_nfs4.ko ${mntpt}/boot/kernel/acl_nfs4.ko
cp /boot/kernel/zfs.ko ${mntpt}/boot/kernel/zfs.ko
cp /boot/kernel/opensolaris.ko ${mntpt}/boot/kernel/opensolaris.ko
cp /boot/kernel/geom_eli.ko ${mntpt}/boot/kernel/geom_eli.ko
@@ -543,6 +550,7 @@ zfs_load=YES
opensolaris_load=YES
geom_eli_load=YES
EOF
+ cp /boot/kernel/acl_nfs4.ko ${mntpt}/boot/kernel/acl_nfs4.ko
cp /boot/kernel/zfs.ko ${mntpt}/boot/kernel/zfs.ko
cp /boot/kernel/opensolaris.ko ${mntpt}/boot/kernel/opensolaris.ko
cp /boot/kernel/geom_eli.ko ${mntpt}/boot/kernel/geom_eli.ko
@@ -587,6 +595,7 @@ zfs_load=YES
opensolaris_load=YES
geom_eli_load=YES
EOF
+ cp /boot/kernel/acl_nfs4.ko ${mntpt}/boot/kernel/acl_nfs4.ko
cp /boot/kernel/zfs.ko ${mntpt}/boot/kernel/zfs.ko
cp /boot/kernel/opensolaris.ko ${mntpt}/boot/kernel/opensolaris.ko
cp /boot/kernel/geom_eli.ko ${mntpt}/boot/kernel/geom_eli.ko
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
