aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorIan Lepore <ian@FreeBSD.org>2019-04-24 23:52:38 +0000
committerIan Lepore <ian@FreeBSD.org>2019-04-24 23:52:38 +0000
commit827f1973cb7f884e3cc41f5e4ad826188a7c5357 (patch)
treea77acccf8ce6ed29039d2b4d6eec83204ddf4849 /tools
parentf576caac25e415b01fabe6dc8f4b959dc32c2752 (diff)
downloadsrc-827f1973cb7f884e3cc41f5e4ad826188a7c5357.tar.gz
src-827f1973cb7f884e3cc41f5e4ad826188a7c5357.zip
The zfs module has grown a dependency on zcl_nfs4.ko, so copy it into all
the test images.
Notes
Notes: svn path=/head/; revision=346653
Diffstat (limited to 'tools')
-rwxr-xr-xtools/boot/rootgen.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/boot/rootgen.sh b/tools/boot/rootgen.sh
index 4f209cb24392..e66ccfb5534f 100755
--- a/tools/boot/rootgen.sh
+++ b/tools/boot/rootgen.sh
@@ -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