isc-dhcp: allow suppression of default gateway 20570/head
authorPhilip Prindeville <philipp@redfish-solutions.com>
Mon, 27 Feb 2023 00:49:13 +0000 (17:49 -0700)
committerPhilip Prindeville <philipp@redfish-solutions.com>
Wed, 1 Mar 2023 15:54:34 +0000 (08:54 -0700)
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
net/isc-dhcp/files/dhcpd.init

index 76fa34ae66d0d3cae92940be7c00ed7eba69e21c..7eb3dc3af762dc8cf3206cea816010e07499e629 100755 (executable)
@@ -364,7 +364,9 @@ gen_dhcp_subnet() {
                echo " default-lease-time $leasetime;"
                echo " max-lease-time $leasetime;"
        fi
-       echo " option routers $gateway;"
+       if [ "$defaultroute" -eq 1 ] ; then
+               echo " option routers $gateway;"
+       fi
        echo " option domain-name-servers $DNS;"
        config_list_foreach "$cfg" "routes" append_routes
        config_list_foreach "$cfg" "dhcp_option" append_dhcp_options
@@ -374,7 +376,7 @@ gen_dhcp_subnet() {
 dhcpd_add() {
        local cfg="$1" synthesize="$2"
        local dhcp6range="::"
-       local dynamicdhcp end gateway ifname ignore leasetime limit net netmask
+       local dynamicdhcp defaultroute end gateway ifname ignore leasetime limit net netmask
        local proto networkid start subnet
        local IP NETMASK BROADCAST NETWORK PREFIX DNS START END
 
@@ -404,6 +406,8 @@ dhcpd_add() {
 
        config_get_bool dynamicdhcp "$cfg" "dynamicdhcp" 1
 
+       config_get_bool defaultroute "$cfg" "default_route" 1
+
        dhcp_ifs="$dhcp_ifs $ifname"
 
        eval "$(ipcalc.sh $subnet $start $limit)"