X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5e4f3f7961b85eec809c2c5e581876ab9bd94b71..ccf3bdc4a6309f23aa80e643b4b4c734ab4100ca:/package/dnsmasq/files/dnsmasq.init?ds=inline diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index 69f499a7d..870414900 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() { @@ -36,6 +36,10 @@ append_parm() { append args "$switch $_loctmp" } +append_server() { + append args "-S $1" +} + dnsmasq() { local cfg="$1" append_bool "$cfg" authoritative "-K" @@ -49,9 +53,10 @@ dnsmasq() { append_bool "$cfg" noresolv "-R" append_bool "$cfg" localise_queries "-y" append_bool "$cfg" readethers "-Z" - append_bool "$cfg" dbus "-l" + append_bool "$cfg" dbus "-1" append_bool "$cfg" boguspriv "-b" append_bool "$cfg" expandhosts "-E" + append_bool "$cfg" enable_tftp "--enable-tftp" append_parm "$cfg" dnsforwardmax "-0" append_parm "$cfg" port "-p" @@ -61,8 +66,15 @@ dnsmasq() { append_parm "$cfg" "queryport" "-Q" append_parm "$cfg" "domain" "-s" append_parm "$cfg" "local" "-S" + config_list_foreach "$cfg" "server" append_server append_parm "$cfg" "leasefile" "-l" append_parm "$cfg" "resolvfile" "-r" + append_parm "$cfg" "tftp_root" "--tftp-root" + append_parm "$cfg" "dhcp_boot" "--dhcp-boot" + + config_get leasefile $cfg leasefile + [ -e "$leasefile" ] || touch "$leasefile" + config_get_bool cachelocal "$cfg" cachelocal 1 } dhcp_subscrid_add() { @@ -166,6 +178,26 @@ dhcp_mac_add() { dhcp_option_add "$cfg" "$name" } +dhcp_boot_add() { + local cfg="$1" + + config_get name "$cfg" name + + 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=${name:+net:$name,}$filename,$servername,$serveraddress" + + dhcp_option_add "$cfg" "$name" +} + + dhcp_add() { local cfg="$1" config_get net "$cfg" interface @@ -178,22 +210,23 @@ dhcp_add() { [ -n "$ifname" ] || return 0 config_get dnsserver "$net" dns - [ -n "$dnsserver" ] && { + [ "$cachelocal" = "0" -a -n "$dnsserver" ] && { 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 [ "$force" -gt 0 ] || { - udhcpc -n -q -R -s /bin/true -t 1 -i $ifname >&- && return 0 + udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && return 0 } config_get start "$cfg" start @@ -216,13 +249,9 @@ dhcp_option_add() { local cfg="$1" local name="$2" - for count in $(seq 0 100); do - eval current_value=\$CONFIG_"$cfg"_dhcp"$count" - if [ -z "$current_value" ]; then - let "count-=1" - break - fi - append args "-O $name","$current_value" + config_get dhcp_option "$cfg" dhcp_option + for o in $dhcp_option; do + append args "-O $name","$o" done } @@ -230,12 +259,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 @@ -254,5 +283,10 @@ start() { } stop() { + [ -f /tmp/resolv.conf ] && { + rm -f /tmp/resolv.conf + ln -s /tmp/resolv.conf.auto /tmp/resolv.conf + } killall dnsmasq + return 0 }