projects
/
openwrt
/
staging
/
dedeckeh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dnsmasq: rewrite config on host name modification
[openwrt/staging/dedeckeh.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 533945c2a4c0b5fbebc2186eb32c7a36799ae04b..204e27d9cffd784bb283d51bdc0ab33a787684b1 100644
(file)
--- a/
package/network/services/dnsmasq/files/dnsmasq.init
+++ b/
package/network/services/dnsmasq/files/dnsmasq.init
@@
-13,7
+13,6
@@
ADD_LOCAL_FQDN=""
BASECONFIGFILE="/var/etc/dnsmasq.conf"
BASEHOSTFILE="/tmp/hosts/dhcp"
BASECONFIGFILE="/var/etc/dnsmasq.conf"
BASEHOSTFILE="/tmp/hosts/dhcp"
-BASETIMESTAMPFILE="/etc/dnsmasq.time"
TRUSTANCHORSFILE="/usr/share/dnsmasq/trust-anchors.conf"
TIMEVALIDFILE="/var/state/dnsmasqsec"
BASEDHCPSTAMPFILE="/var/run/dnsmasq"
TRUSTANCHORSFILE="/usr/share/dnsmasq/trust-anchors.conf"
TIMEVALIDFILE="/var/state/dnsmasqsec"
BASEDHCPSTAMPFILE="/var/run/dnsmasq"
@@
-142,6
+141,10
@@
append_interface() {
xappend "--interface=$ifname"
}
xappend "--interface=$ifname"
}
+append_listenaddress() {
+ xappend "--listen-address=$1"
+}
+
append_notinterface() {
network_get_device ifname "$1" || ifname="$1"
xappend "--except-interface=$ifname"
append_notinterface() {
network_get_device ifname "$1" || ifname="$1"
xappend "--except-interface=$ifname"
@@
-273,7
+276,7
@@
dhcp_match_add() {
dhcp_host_add() {
local cfg="$1"
dhcp_host_add() {
local cfg="$1"
- local hosttag nametime addrs duids
+ local hosttag nametime addrs duids
macs tags
config_get_bool force "$cfg" force 0
config_get_bool force "$cfg" force 0
@@
-291,7
+294,7
@@
dhcp_host_add() {
config_get_bool dns "$cfg" dns 0
[ "$dns" = "1" -a -n "$ip" -a -n "$name" ] && {
config_get_bool dns "$cfg" dns 0
[ "$dns" = "1" -a -n "$ip" -a -n "$name" ] && {
- echo "$ip $name${DOMAIN:+.$DOMAIN}" >> $HOSTFILE
+ echo "$ip $name${DOMAIN:+.$DOMAIN}" >> $HOSTFILE
_TMP
}
config_get mac "$cfg" mac
}
config_get mac "$cfg" mac
@@
-301,7
+304,6
@@
dhcp_host_add() {
if [ -n "$mac" ]; then
# --dhcp-host=00:20:e0:3b:13:af,192.168.0.199,lap
# many MAC are possible to track a laptop ON/OFF dock
if [ -n "$mac" ]; then
# --dhcp-host=00:20:e0:3b:13:af,192.168.0.199,lap
# many MAC are possible to track a laptop ON/OFF dock
- macs=""
for m in $mac; do append macs "$m" ","; done
fi
for m in $mac; do append macs "$m" ","; done
fi
@@
-319,10
+321,9
@@
dhcp_host_add() {
fi
if [ -n "$hostid" ]; then
fi
if [ -n "$hostid" ]; then
-
hex_to_hostid hostid "$hostid"
+ hex_to_hostid hostid "$hostid"
fi
fi
- tags=""
if [ -n "$tag" ]; then
for t in $tag; do append tags "$t" ",set:"; done
fi
if [ -n "$tag" ]; then
for t in $tag; do append tags "$t" ",set:"; done
fi
@@
-383,8
+384,8
@@
dhcp_this_host_add() {
for lanaddr6 in $lanaddrs6 ; do
case "$lanaddr6" in
"${ulaprefix%%:/*}"*)
for lanaddr6 in $lanaddrs6 ; do
case "$lanaddr6" in
"${ulaprefix%%:/*}"*)
-
dhcp_domain_add "" "$routername" "$lanaddr6"
-
;;
+ dhcp_domain_add "" "$routername" "$lanaddr6"
+ ;;
esac
done
fi
esac
done
fi
@@
-457,9
+458,7
@@
dhcp_add() {
config_get networkid "$cfg" networkid
[ -n "$networkid" ] || networkid="$net"
config_get networkid "$cfg" networkid
[ -n "$networkid" ] || networkid="$net"
- network_get_subnet subnet "$net" || return 0
network_get_device ifname "$net" || return 0
network_get_device ifname "$net" || return 0
- network_get_protocol proto "$net" || return 0
[ "$cachelocal" = "0" ] && network_get_dnsserver dnsserver "$net" && {
DNS_SERVERS="$DNS_SERVERS $dnsserver"
[ "$cachelocal" = "0" ] && network_get_dnsserver dnsserver "$net" && {
DNS_SERVERS="$DNS_SERVERS $dnsserver"
@@
-471,6
+470,9
@@
dhcp_add() {
return 0
}
return 0
}
+ network_get_subnet subnet "$net" || return 0
+ network_get_protocol proto "$net" || return 0
+
# Do not support non-static interfaces for now
[ static = "$proto" ] || return 0
# Do not support non-static interfaces for now
[ static = "$proto" ] || return 0
@@
-633,7
+635,7
@@
dhcp_domain_add() {
record="${record:+$record }$name"
done
record="${record:+$record }$name"
done
- echo "$ip $record" >> $HOSTFILE
+ echo "$ip $record" >> $HOSTFILE
_TMP
}
dhcp_srv_add() {
}
dhcp_srv_add() {
@@
-739,7
+741,7
@@
dnsmasq_start()
CONFIGFILE="${BASECONFIGFILE}.${cfg}"
CONFIGFILE_TMP="${CONFIGFILE}.$$"
HOSTFILE="${BASEHOSTFILE}.${cfg}"
CONFIGFILE="${BASECONFIGFILE}.${cfg}"
CONFIGFILE_TMP="${CONFIGFILE}.$$"
HOSTFILE="${BASEHOSTFILE}.${cfg}"
-
TIMESTAMPFILE="${BASETIMESTAMPFILE}.${cfg}
"
+
HOSTFILE_TMP="${HOSTFILE}.$$
"
BASEDHCPSTAMPFILE_CFG="${BASEDHCPSTAMPFILE}.${cfg}"
# before we can call xappend
BASEDHCPSTAMPFILE_CFG="${BASEDHCPSTAMPFILE}.${cfg}"
# before we can call xappend
@@
-749,14
+751,17
@@
dnsmasq_start()
mkdir -p /var/lib/misc
chown dnsmasq:dnsmasq /var/run/dnsmasq
mkdir -p /var/lib/misc
chown dnsmasq:dnsmasq /var/run/dnsmasq
- [ -f "$TIMESTAMPFILE" ] && rm -f "$TIMESTAMPFILE"
-
echo "# auto-generated config file from /etc/config/dhcp" > $CONFIGFILE_TMP
echo "# auto-generated config file from /etc/config/dhcp" > $CONFIGFILE_TMP
- echo "# auto-generated config file from /etc/config/dhcp" > $HOSTFILE
+ echo "# auto-generated config file from /etc/config/dhcp" > $HOSTFILE_TMP
+
+ local dnsmasqconffile="/etc/dnsmasq.${cfg}.conf"
+ if [ ! -r "$dnsmasqconffile" ]; then
+ dnsmasqconffile=/etc/dnsmasq.conf
+ fi
# if we did this last, we could override auto-generated config
# if we did this last, we could override auto-generated config
- [ -f
/etc/dnsmasq.conf
] && {
- xappend "--conf-file=
/etc/dnsmasq.conf
"
+ [ -f
"${dnsmasqconffile}"
] && {
+ xappend "--conf-file=
${dnsmasqconffile}
"
}
$PROG --version | grep -osqE "^Compile time options:.* DHCPv6( |$)" && DHCPv6CAPABLE=1 || DHCPv6CAPABLE=0
}
$PROG --version | grep -osqE "^Compile time options:.* DHCPv6( |$)" && DHCPv6CAPABLE=1 || DHCPv6CAPABLE=0
@@
-834,6
+839,7
@@
dnsmasq_start()
append_parm "$cfg" "maxport" "--max-port"
append_parm "$cfg" "domain" "--domain"
append_parm "$cfg" "local" "--server"
append_parm "$cfg" "maxport" "--max-port"
append_parm "$cfg" "domain" "--domain"
append_parm "$cfg" "local" "--server"
+ config_list_foreach "$cfg" "listen_address" append_listenaddress
config_list_foreach "$cfg" "server" append_server
config_list_foreach "$cfg" "rev_server" append_rev_server
config_list_foreach "$cfg" "address" append_address
config_list_foreach "$cfg" "server" append_server
config_list_foreach "$cfg" "rev_server" append_rev_server
config_list_foreach "$cfg" "address" append_address
@@
-993,6
+999,7
@@
dnsmasq_start()
echo >> $CONFIGFILE_TMP
mv -f $CONFIGFILE_TMP $CONFIGFILE
echo >> $CONFIGFILE_TMP
mv -f $CONFIGFILE_TMP $CONFIGFILE
+ mv -f $HOSTFILE_TMP $HOSTFILE
[ "$resolvfile" = "/tmp/resolv.conf.auto" ] && {
rm -f /tmp/resolv.conf
[ "$resolvfile" = "/tmp/resolv.conf.auto" ] && {
rm -f /tmp/resolv.conf
@@
-1011,11
+1018,6
@@
dnsmasq_start()
[ -n "$user_dhcpscript" ] && procd_set_param env USER_DHCPSCRIPT="$user_dhcpscript"
procd_set_param respawn
[ -n "$user_dhcpscript" ] && procd_set_param env USER_DHCPSCRIPT="$user_dhcpscript"
procd_set_param respawn
- local dnsmasqconffile="/etc/dnsmasq.${cfg}.conf"
- if [ ! -r "$dnsmasqconffile" ]; then
- dnsmasqconffile=/etc/dnsmasq.conf
- fi
-
procd_add_jail dnsmasq ubus log
procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT
procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
procd_add_jail dnsmasq ubus log
procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT
procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
@@
-1042,7
+1044,7
@@
dnsmasq_stop()
service_triggers()
{
service_triggers()
{
- procd_add_reload_trigger "dhcp"
+ procd_add_reload_trigger "dhcp"
"system"
procd_add_raw_trigger "interface.*" 2000 /etc/init.d/dnsmasq reload
}
procd_add_raw_trigger "interface.*" 2000 /etc/init.d/dnsmasq reload
}