]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
fix(test): use bash for jobs -r parameter
authorBenjamin Drung <benjamin.drung@canonical.com>
Mon, 21 Aug 2023 16:46:59 +0000 (18:46 +0200)
committerAntonio Álvarez Feijoo <antonio.feijoo@suse.com>
Tue, 22 Aug 2023 06:52:53 +0000 (08:52 +0200)
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 <benjamin.drung@canonical.com>
test/TEST-20-NFS/server-init.sh
test/TEST-20-NFS/test.sh
test/TEST-50-MULTINIC/server-init.sh
test/TEST-50-MULTINIC/test.sh

index 6abe82662a6246d5e129d51217cf5279a73bcf7d..0c06eea11d05f8855c19f8977b9a645d83443dba 100755 (executable)
@@ -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
index 6cbf1d00bb6d3615f319082822db9b5e3937e372..b7cca75b1b9bd7cd87403da2660bd238af555ffc 100755 (executable)
@@ -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
index 91db7ae765c01568129add9e560682ca0c0b723c..997b1d1f4f7d2c97358a1aec8495d6729e02418d 100755 (executable)
@@ -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
index bdccd23095582e25f49d6359b08a9a0beec33a90..4f8123530d909f7679b9f18cf69ae5f757608e78 100755 (executable)
@@ -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