Skip to content

Commit 9a18f13

Browse files
bdrungaafeijoo-suse
authored andcommitted
fix(test): use bash for jobs -r parameter
Test 20 - "NFSv3 root=dhcp DHCP IP:path" fails on Debian with following error message in `server.log`: ``` jobs -rp /sbin/init: 105: jobs: Illegal option -r ``` The jobs parameter `-r` requires bash. Partially fixes #1901 Signed-off-by: Benjamin Drung <[email protected]>
1 parent 8e9d89d commit 9a18f13

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

test/TEST-20-NFS/server-init.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
exec < /dev/console > /dev/console 2>&1
33
set -x
44
export PATH=/usr/sbin:/usr/bin:/sbin:/bin

test/TEST-20-NFS/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ test_setup() {
415415
)
416416
# Make server's dracut image
417417
"$DRACUT" -l -i "$TESTDIR"/overlay / \
418-
-m "dash rootfs-block debug kernel-modules watchdog qemu network network-legacy" \
418+
-m "bash rootfs-block debug kernel-modules watchdog qemu network network-legacy" \
419419
-d "af_packet piix ide-gd_mod ata_piix ext4 sd_mod e1000 i6300esb" \
420420
--no-hostonly-cmdline -N \
421421
-f "$TESTDIR"/initramfs.server "$KVERSION" || return 1

test/TEST-50-MULTINIC/server-init.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
exec < /dev/console > /dev/console 2>&1
33
set -x
44
export PATH=/usr/sbin:/usr/bin:/sbin:/bin

test/TEST-50-MULTINIC/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ test_setup() {
354354
)
355355
# Make server's dracut image
356356
"$DRACUT" -l -i "$TESTDIR"/overlay / \
357-
-m "dash rootfs-block debug kernel-modules watchdog qemu network network-legacy" \
357+
-m "bash rootfs-block debug kernel-modules watchdog qemu network network-legacy" \
358358
-d "af_packet piix ide-gd_mod ata_piix ext4 sd_mod nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files nfsd e1000 i6300esb ib700wdt" \
359359
--no-hostonly-cmdline -N \
360360
-f "$TESTDIR"/initramfs.server "$KVERSION" || return 1

0 commit comments

Comments
 (0)