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.
dracutdevs · Feb 7, 2023 · da95948 · da95948
1 parent d3993c7
commit da95948
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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 \