X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/02ab35ee7f8f25ac56ac0e8ccbaa51926a0d92ea..d59e028829fab21384fcd5f9d86199d679759971:/package/dnsmasq/files/dnsmasq.init?ds=inline diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index 75b20df0e..c96654ef3 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -23,7 +23,7 @@ append_bool() { local value="$3" local _loctmp config_get_bool _loctmp "$section" "$option" - [ "$_loctmp" -gt 0 ] && append args "$3" + [ "$_loctmp" -gt 0 ] && append args "$value" } append_parm() { @@ -63,6 +63,9 @@ dnsmasq() { append_parm "$cfg" "local" "-S" append_parm "$cfg" "leasefile" "-l" append_parm "$cfg" "resolvfile" "-r" + + config_get leasefile $cfg leasefile + [ -e "$leasefile" ] || touch "$leasefile" } dhcp_subscrid_add() { @@ -166,6 +169,27 @@ dhcp_mac_add() { dhcp_option_add "$cfg" "$name" } +dhcp_boot_add() { + local cfg="$1" + + config_get name "$cfg" name + [ -n "$name" ] || return 0 + + config_get filename "$cfg" filename + [ -n "$filename" ] || return 0 + + config_get servername "$cfg" servername + [ -n "$servername" ] || return 0 + + config_get serveraddress "$cfg" serveraddress + [ -n "$serveraddress" ] || return 0 + + append args "--dhcp-boot=net:$name,$filename,$servername,$serveraddress" + + dhcp_option_add "$cfg" "$name" +} + + dhcp_add() { local cfg="$1" config_get net "$cfg" interface @@ -182,13 +206,14 @@ dhcp_add() { DNS_SERVERS="$DNS_SERVERS $dnsserver" } - append_bool "$cfg" ignore "-I $ifname" + append_bool "$cfg" ignore "-2 $ifname" config_get proto "$net" proto [ static = "$proto" ] || return 0 config_get ipaddr "$net" ipaddr - config_get netmask "$net" netmask + config_get netmask "$cfg" netmask + [ -n "$netmask" ] || config_get netmask "$net" netmask #check for an already active dhcp server on the interface, unless 'force' is set config_get_bool force "$cfg" force 0 @@ -200,11 +225,13 @@ dhcp_add() { config_get limit "$cfg" limit config_get leasetime "$cfg" leasetime config_get options "$cfg" options + config_get_bool dynamicdhcp "$cfg" dynamicdhcp 1 leasetime="${leasetime:-12h}" start="$(dhcp_calc "${start:-100}")" limit="$((${limit:-150} + 1))" eval "$(ipcalc.sh $ipaddr $netmask $start $limit)" + if [ "$dynamicdhcp" = "0" ]; then END="static"; fi append args "--dhcp-range=$name,$START,$END,$NETMASK,$leasetime${options:+ $options}" dhcp_option_add "$cfg" "$name" @@ -228,12 +255,12 @@ dhcp_option_add() { start() { include /lib/network scan_interfaces - config_load /var/state/network config_load dhcp args="" config_foreach dnsmasq dnsmasq config_foreach dhcp_host_add host + config_foreach dhcp_boot_add boot config_foreach dhcp_mac_add mac config_foreach dhcp_vendorclass_add vendorclass config_foreach dhcp_userclass_add userclass