@@ -57,10 +57,12 @@ client_test() {
57
57
58
58
# Need this so kvm-qemu will boot (needs non-/dev/zero local disk)
59
59
dd if=/dev/zero of=" $TESTDIR " /marker.img bs=1MiB count=1
60
+ dd if=/dev/zero of=" $TESTDIR " /marker2.img bs=1MiB count=1
60
61
declare -a disk_args=()
61
62
# shellcheck disable=SC2034
62
63
declare -i disk_index=0
63
64
qemu_add_drive_args disk_index disk_args " $TESTDIR " /marker.img marker
65
+ qemu_add_drive_args disk_index disk_args " $TESTDIR " /marker2.img marker2
64
66
cmdline=" $cmdline rd.net.timeout.dhcp=30"
65
67
66
68
" $testdir " /run-qemu \
@@ -115,6 +117,11 @@ client_test() {
115
117
return 1
116
118
fi
117
119
120
+ if ! grep -U --binary-files=binary -F -m 1 -q nfsfetch-OK " $TESTDIR " /marker2.img; then
121
+ echo " CLIENT TEST END: $test_name [FAILED - NFS FETCH FAILED]"
122
+ return 1
123
+ fi
124
+
118
125
echo " CLIENT TEST END: $test_name [OK]"
119
126
return 0
120
127
}
@@ -257,6 +264,7 @@ test_setup() {
257
264
done
258
265
type -P portmap > /dev/null && inst_multiple portmap
259
266
type -P rpcbind > /dev/null && inst_multiple rpcbind
267
+
260
268
[ -f /etc/netconfig ] && inst_multiple /etc/netconfig
261
269
type -P dhcpd > /dev/null && inst_multiple dhcpd
262
270
[ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
@@ -302,6 +310,7 @@ test_setup() {
302
310
(
303
311
cd " $initdir " || exit
304
312
mkdir -p dev sys proc etc run root usr var/lib/nfs/rpc_pipefs
313
+ echo " TEST FETCH FILE" > root/fetchfile
305
314
)
306
315
307
316
inst_multiple sh shutdown poweroff stty cat ps ln ip dd \
@@ -315,6 +324,9 @@ test_setup() {
315
324
316
325
inst_simple " ${basedir} /modules.d/99base/dracut-lib.sh" " /lib/dracut-lib.sh"
317
326
inst_simple " ${basedir} /modules.d/99base/dracut-dev-lib.sh" " /lib/dracut-dev-lib.sh"
327
+ inst_simple " ${basedir} /modules.d/45url-lib/url-lib.sh" " /lib/url-lib.sh"
328
+ inst_simple " ${basedir} /modules.d/40network/net-lib.sh" " /lib/net-lib.sh"
329
+ inst_simple " ${basedir} /modules.d/95nfs/nfs-lib.sh" " /lib/nfs-lib.sh"
318
330
inst_binary " ${basedir} /dracut-util" " /usr/bin/dracut-util"
319
331
ln -s dracut-util " ${initdir} /usr/bin/dracut-getarg"
320
332
ln -s dracut-util " ${initdir} /usr/bin/dracut-getargs"
0 commit comments