The zfs module has grown a dependency on zcl_nfs4.ko, so copy it into all

the test images.
This commit is contained in:
Ian Lepore 2019-04-24 23:52:38 +00:00
parent f576caac25
commit 827f1973cb
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=346653

View File

@ -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