From 9a18f1335fcab1eb84fedc45e450851d093335aa Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Mon, 21 Aug 2023 18:46:59 +0200 Subject: [PATCH] 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 --- test/TEST-20-NFS/server-init.sh | 2 +- test/TEST-20-NFS/test.sh | 2 +- test/TEST-50-MULTINIC/server-init.sh | 2 +- test/TEST-50-MULTINIC/test.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/TEST-20-NFS/server-init.sh b/test/TEST-20-NFS/server-init.sh index 6abe82662a..0c06eea11d 100755 --- a/test/TEST-20-NFS/server-init.sh +++ b/test/TEST-20-NFS/server-init.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash exec < /dev/console > /dev/console 2>&1 set -x export PATH=/usr/sbin:/usr/bin:/sbin:/bin diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 6cbf1d00bb..b7cca75b1b 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -415,7 +415,7 @@ test_setup() { ) # Make server's dracut image "$DRACUT" -l -i "$TESTDIR"/overlay / \ - -m "dash rootfs-block debug kernel-modules watchdog qemu network network-legacy" \ + -m "bash rootfs-block debug kernel-modules watchdog qemu network network-legacy" \ -d "af_packet piix ide-gd_mod ata_piix ext4 sd_mod e1000 i6300esb" \ --no-hostonly-cmdline -N \ -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1 diff --git a/test/TEST-50-MULTINIC/server-init.sh b/test/TEST-50-MULTINIC/server-init.sh index 91db7ae765..997b1d1f4f 100755 --- a/test/TEST-50-MULTINIC/server-init.sh +++ b/test/TEST-50-MULTINIC/server-init.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash exec < /dev/console > /dev/console 2>&1 set -x export PATH=/usr/sbin:/usr/bin:/sbin:/bin diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index bdccd23095..4f8123530d 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -354,7 +354,7 @@ test_setup() { ) # Make server's dracut image "$DRACUT" -l -i "$TESTDIR"/overlay / \ - -m "dash rootfs-block debug kernel-modules watchdog qemu network network-legacy" \ + -m "bash rootfs-block debug kernel-modules watchdog qemu network network-legacy" \ -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" \ --no-hostonly-cmdline -N \ -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1