dnsmasq: Set the default dhcp lease file and resolv file

[openwrt/staging/florian.git] / package / network / services / dnsmasq / files / dnsmasq.init

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 61ded6a53a8dd9e6d6b2608dba62245474c3e63a..0360548e0d5eb107d85c4f5d0af9e8dab0b3cb98 100644 (file)
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -72,8 +72,9 @@ append_parm() {
        local section="$1"
        local option="$2"
        local switch="$3"
+       local default="$4"
        local _loctmp
-       config_get _loctmp "$section" "$option"
+       config_get _loctmp "$section" "$option" "$default"
        [ -z "$_loctmp" ] && return 0
        xappend "$switch=$_loctmp"
 }
@@ -157,8 +158,8 @@ dnsmasq() {
        config_list_foreach "$cfg" "notinterface" append_notinterface
        config_list_foreach "$cfg" "addnhosts" append_addnhosts
        config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
-       append_parm "$cfg" "leasefile" "--dhcp-leasefile"
-       append_parm "$cfg" "resolvfile" "--resolv-file"
+       append_parm "$cfg" "leasefile" "--dhcp-leasefile" "/tmp/dhcp.leases"
+       append_parm "$cfg" "resolvfile" "--resolv-file" "/tmp/resolv.conf.auto"
        append_parm "$cfg" "serversfile" "--servers-file"
        append_parm "$cfg" "tftp_root" "--tftp-root"
        append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
@@ -173,10 +174,17 @@ dnsmasq() {
        config_get_bool readethers "$cfg" readethers
        [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers
 
-       config_get leasefile $cfg leasefile
+       config_get leasefile $cfg leasefile "/tmp/dhcp.leases"
        [ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"
        config_get_bool cachelocal "$cfg" cachelocal 1
 
+       config_get_bool noresolv "$cfg" noresolv 0
+       if [ "$noresolv" != "1" ]; then
+               config_get resolvfile "$cfg" resolvfile "/tmp/resolv.conf.auto"
+               # So jail doesn't complain if file missing
+               [ -n "$resolvfile" -a \! -e "$resolvfile" ] && touch "$resolvfile"
+       fi
+
        config_get hostsfile "$cfg" dhcphostsfile
        [ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile"
 
@@ -218,6 +226,8 @@ dnsmasq() {
        mkdir -p /tmp/hosts /tmp/dnsmasq.d
        xappend "--addn-hosts=/tmp/hosts"
        xappend "--conf-dir=/tmp/dnsmasq.d"
+       xappend "--user=dnsmasq"
+       xappend "--group=dnsmasq"
 
        echo >> $CONFIGFILE
 
@@ -316,6 +326,9 @@ dhcp_host_add() {
        config_get networkid "$cfg" networkid
        [ -n "$networkid" ] && dhcp_option_add "$cfg" "$networkid" "$force"
 
+       config_get_bool enable "$cfg" enable 1
+       [ "$enable" = "0" ] && return 0
+
        config_get name "$cfg" name
        config_get ip "$cfg" ip
        [ -n "$ip" -o -n "$name" ] || return 0
@@ -589,7 +602,7 @@ start_service() {
 
        if [ ! -f "$TIMESTAMPFILE" ]; then
                touch "$TIMESTAMPFILE"
-               chown nobody.nogroup "$TIMESTAMPFILE"
+               chown dnsmasq.dnsmasq "$TIMESTAMPFILE"
        fi
 
        echo "# auto-generated config file from /etc/config/dhcp" > $CONFIGFILE
@@ -620,7 +633,7 @@ start_service() {
        [ $ADD_LOCAL_HOSTNAME -eq 1 ] && {
                local lanaddr lanaddr6
                local ulaprefix="$(uci_get network @globals[0] ula_prefix)"
-               local hostname="$(uci_get system @system[0] hostname OpenWrt)"
+               local hostname="$(uci_get system @system[0] hostname Lede)"
 
                network_get_ipaddr lanaddr "lan" && {
                        dhcp_domain_add "" "$hostname" "$lanaddr"