From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 1 Feb 2023 10:07:49 +0000 (+0100)
Subject: fix(test): remove check on dhclient support for --timeout
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da959483333c6ab83e4cdef837130eacec6b35d7;p=thirdparty%2Fdracut.git

fix(test): remove check on dhclient support for --timeout

The network-legacy dracut module already ignores the DHCP timeout option when
it's not supported by dhclient. Other network modules don't use dhclient for
DHCP.
---

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index c637b5788..8f26ddcc4 100755
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -61,10 +61,7 @@ client_test() {
     # shellcheck disable=SC2034
     declare -i disk_index=0
     qemu_add_drive_args disk_index disk_args "$TESTDIR"/marker.img marker
-
-    if dhclient --help 2>&1 | grep -q -F -- '--timeout' 2> /dev/null; then
-        cmdline="$cmdline rd.net.timeout.dhcp=3"
-    fi
+    cmdline="$cmdline rd.net.timeout.dhcp=3"
 
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index 21362b99c..9d84ff7d0 100755
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -63,10 +63,7 @@ client_test() {
     # shellcheck disable=SC2034
     declare -i disk_index=0
     qemu_add_drive_args disk_index disk_args "$TESTDIR"/marker.img marker
-
-    if dhclient --help 2>&1 | grep -q -F -- '--timeout' 2> /dev/null; then
-        cmdline="$cmdline rd.net.timeout.dhcp=3"
-    fi
+    cmdline="$cmdline rd.net.timeout.dhcp=3"
 
     # Invoke KVM and/or QEMU to actually create the target filesystem.
     "$testdir"/run-qemu \