network/dhclient-script.sh: make IPv4 DHCP lease time optionally

If bootp is used, no lease time is provided in the packet from the bootp
server.

diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh
index 320208b5a6164f3c6ea1e3411c7ba2e20632636a..a8b5b89fa4db595c1661da2a3ebba967d07febe9 100755 (executable)
--- a/modules.d/40network/dhclient-script.sh
+++ b/modules.d/40network/dhclient-script.sh
@@ -39,9 +39,9 @@ setup_interface() {
         fi
     fi
 
-    ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} \
-        valid_lft ${lease_time} preferred_lft ${lease_time} \
-        dev $netif
+    ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} dev $netif \
+        ${lease_time:+valid_lft $lease_time} \
+        ${preferred_lft:+preferred_lft ${preferred_lft}}
 
     if [ -n "$gw" ] ; then
         if [ "$mask" == "255.255.255.255" ] ; then