Skip to content

Commit

Permalink
fix(test): use bash for jobs -r parameter
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bdrung authored and aafeijoo-suse committed Aug 22, 2023
1 parent 8e9d89d commit 9a18f13
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion test/TEST-20-NFS/server-init.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/TEST-20-NFS/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/TEST-50-MULTINIC/server-init.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/TEST-50-MULTINIC/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9a18f13

Please sign in to comment.