From ec8974914f4a2b9a1a7b2709812b2e74b9a7eded Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Tue, 31 Jul 2012 15:15:13 +0200 Subject: [PATCH] ensure af_packet module is loaded (if not built-in) --- test/TEST-20-NFS/server-init.sh | 2 ++ test/TEST-20-NFS/test.sh | 2 +- test/TEST-40-NBD/server-init.sh | 1 + test/TEST-40-NBD/test.sh | 1 + test/TEST-50-MULTINIC/server-init.sh | 2 ++ test/TEST-50-MULTINIC/test.sh | 2 +- 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/test/TEST-20-NFS/server-init.sh b/test/TEST-20-NFS/server-init.sh index 58fdeee6b..ac07fc20b 100755 --- a/test/TEST-20-NFS/server-init.sh +++ b/test/TEST-20-NFS/server-init.sh @@ -15,6 +15,8 @@ ip addr add 192.168.50.2/24 dev eth0 ip addr add 192.168.50.3/24 dev eth0 ip link set eth0 up echo > /dev/watchdog +modprobe af_packet +echo > /dev/watchdog mount --bind /nfs/client /nfs/nfs3-5 echo > /dev/watchdog mount --bind /nfs/client /nfs/ip/192.168.50.101 diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index d096cac96..8747791b1 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -244,7 +244,7 @@ test_setup() { [ -f /etc/netconfig ] && dracut_install /etc/netconfig type -P dhcpd >/dev/null && dracut_install dhcpd [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd - instmods nfsd sunrpc ipv6 lockd + instmods nfsd sunrpc ipv6 lockd af_packet inst ./server-init.sh /sbin/init inst ./hosts /etc/hosts inst ./exports /etc/exports diff --git a/test/TEST-40-NBD/server-init.sh b/test/TEST-40-NBD/server-init.sh index 8d2dd6dea..5e8d56e87 100755 --- a/test/TEST-40-NBD/server-init.sh +++ b/test/TEST-40-NBD/server-init.sh @@ -11,6 +11,7 @@ ip addr add 127.0.0.1/8 dev lo ip link set lo up ip addr add 192.168.50.1/24 dev eth0 ip link set eth0 up +modprobe af_packet nbd-server 2000 /dev/sdb -C /dev/null nbd-server 2001 /dev/sdc -C /dev/null >/var/lib/dhcpd/dhcpd.leases diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index 7fce9c0aa..b8fb04dd3 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -292,6 +292,7 @@ make_server_root() { [ -f ${_terminfodir}/l/linux ] && break done dracut_install -o ${_terminfodir}/l/linux + instmods af_packet type -P dhcpd >/dev/null && dracut_install dhcpd [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd inst ./server-init.sh /sbin/init diff --git a/test/TEST-50-MULTINIC/server-init.sh b/test/TEST-50-MULTINIC/server-init.sh index 43d7f401c..144f83c7d 100755 --- a/test/TEST-50-MULTINIC/server-init.sh +++ b/test/TEST-50-MULTINIC/server-init.sh @@ -13,6 +13,8 @@ ip link set lo up ip addr add 192.168.50.1/24 dev eth0 ip link set eth0 up >/dev/watchdog +modprobe af_packet +> /dev/watchdog modprobe sunrpc >/dev/watchdog mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index dc4aa6a6c..3771a14b0 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -166,7 +166,7 @@ test_setup() { [ -f /etc/netconfig ] && dracut_install /etc/netconfig type -P dhcpd >/dev/null && dracut_install dhcpd [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd - instmods nfsd sunrpc ipv6 lockd + instmods nfsd sunrpc ipv6 lockd af_packet inst ./server-init.sh /sbin/init inst ./hosts /etc/hosts inst ./exports /etc/exports -- 2.47.3