diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:33:11 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:33:11 +0000 |
| commit | ae3ecffbd2e40760fef5dc09db30ea8a81abec70 (patch) | |
| tree | f3b77bfda1bae06d3326ef27c3cb61539e7f93cc /test/TEST-60-BONDBRIDGEVLAN | |
| parent | Adding debian version 102-3. (diff) | |
| download | dracut-ae3ecffbd2e40760fef5dc09db30ea8a81abec70.tar.xz dracut-ae3ecffbd2e40760fef5dc09db30ea8a81abec70.zip | |
Merging upstream version 103.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'test/TEST-60-BONDBRIDGEVLAN')
| -rw-r--r-- | test/TEST-60-BONDBRIDGEVLAN/hosts | 5 | ||||
| -rwxr-xr-x | test/TEST-60-BONDBRIDGEVLAN/test.sh | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/test/TEST-60-BONDBRIDGEVLAN/hosts b/test/TEST-60-BONDBRIDGEVLAN/hosts deleted file mode 100644 index d02a4e9..0000000 --- a/test/TEST-60-BONDBRIDGEVLAN/hosts +++ /dev/null @@ -1,5 +0,0 @@ -127.0.0.1 localhost -192.168.50.1 server -192.168.50.100 client-if1 -192.168.50.101 client-if2 -192.168.50.102 client-if3 diff --git a/test/TEST-60-BONDBRIDGEVLAN/test.sh b/test/TEST-60-BONDBRIDGEVLAN/test.sh index be4cb6d..2ac6d63 100755 --- a/test/TEST-60-BONDBRIDGEVLAN/test.sh +++ b/test/TEST-60-BONDBRIDGEVLAN/test.sh @@ -49,7 +49,7 @@ run_server() { -device virtio-net-pci,netdev=n3,mac=52:54:01:12:34:59 \ -hda "$TESTDIR"/server.ext4 \ -serial "${SERIAL:-"file:$TESTDIR/server.log"}" \ - -append "panic=1 oops=panic softlockup_panic=1 root=LABEL=dracut rootfstype=ext4 rw console=ttyS0,115200n81 selinux=0" \ + -append "panic=1 oops=panic softlockup_panic=1 root=LABEL=dracut rootfstype=ext4 rw console=ttyS0,115200n81" \ -initrd "$TESTDIR"/initramfs.server \ -pidfile "$TESTDIR"/server.pid -daemonize || return 1 chmod 644 -- "$TESTDIR"/server.pid || return 1 @@ -92,6 +92,7 @@ client_test() { -netdev hubport,id=n5,hubid=1 -device virtio-net-pci,mac=52:54:00:12:34:05,netdev=n5 \ -hda "$TESTDIR"/client.img \ -append " + $TEST_KERNEL_CMDLINE ifname=net1:52:54:00:12:34:01 ifname=net2:52:54:00:12:34:02 ifname=net3:52:54:00:12:34:03 @@ -246,7 +247,6 @@ test_setup() { instmods nfsd sunrpc ipv6 lockd af_packet 8021q bonding inst_simple /etc/os-release inst ./server-init.sh /sbin/init - inst ./hosts /etc/hosts inst ./exports /etc/exports inst ./dhcpd.conf /etc/dhcpd.conf inst_multiple -o {,/usr}/etc/nsswitch.conf {,/usr}/etc/rpc {,/usr}/etc/protocols @@ -348,7 +348,7 @@ test_setup() { # Invoke KVM and/or QEMU to actually create the target filesystem. "$testdir"/run-qemu \ "${disk_args[@]}" \ - -append "root=/dev/dracut/root rw rootfstype=ext4 quiet console=ttyS0,115200n81 selinux=0" \ + -append "root=/dev/dracut/root rw rootfstype=ext4 quiet console=ttyS0,115200n81" \ -initrd "$TESTDIR"/initramfs.makeroot || return 1 test_marker_check dracut-root-block-created || return 1 rm -- "$TESTDIR"/marker.img |