projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dnsmasq: fix dnsmasq startup issue
[openwrt/openwrt.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 3b801303b58813bd34a13215eae0e7f956521573..bb8d07ff354ec5444056b2e645302272ce0fbf8c 100644
(file)
--- a/
package/network/services/dnsmasq/files/dnsmasq.init
+++ b/
package/network/services/dnsmasq/files/dnsmasq.init
@@
-13,11
+13,11
@@
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"
RFC6761FILE="/usr/share/dnsmasq/rfc6761.conf"
TRUSTANCHORSFILE="/usr/share/dnsmasq/trust-anchors.conf"
TIMEVALIDFILE="/var/state/dnsmasqsec"
BASEDHCPSTAMPFILE="/var/run/dnsmasq"
RFC6761FILE="/usr/share/dnsmasq/rfc6761.conf"
+DHCPSCRIPT="/usr/lib/dnsmasq/dhcp-script.sh"
DNSMASQ_DHCP_VER=4
DNSMASQ_DHCP_VER=4
@@
-88,12
+88,24
@@
log_once() {
logger -t dnsmasq "$@"
}
logger -t dnsmasq "$@"
}
+has_handler() {
+ local file
+
+ for file in /etc/hotplug.d/dhcp/* /etc/hotplug.d/tftp/* /etc/hotplug.d/neigh/*; do
+ [ -f "$file" ] && return 0
+ done
+
+ return 1
+}
+
append_bool() {
local section="$1"
local option="$2"
local value="$3"
append_bool() {
local section="$1"
local option="$2"
local value="$3"
+ local default="$4"
local _loctmp
local _loctmp
- config_get_bool _loctmp "$section" "$option" 0
+ [ -z "$default" ] && default="0"
+ config_get_bool _loctmp "$section" "$option" "$default"
[ $_loctmp -gt 0 ] && xappend "$value"
}
[ $_loctmp -gt 0 ] && xappend "$value"
}
@@
-112,6
+124,10
@@
append_server() {
xappend "--server=$1"
}
xappend "--server=$1"
}
+append_rev_server() {
+ xappend "--rev-server=$1"
+}
+
append_address() {
xappend "--address=$1"
}
append_address() {
xappend "--address=$1"
}
@@
-121,12
+137,16
@@
append_ipset() {
}
append_interface() {
}
append_interface() {
- network_get_device ifname "$1" ||
return
+ network_get_device ifname "$1" ||
ifname="$1"
xappend "--interface=$ifname"
}
xappend "--interface=$ifname"
}
+append_listenaddress() {
+ xappend "--listen-address=$1"
+}
+
append_notinterface() {
append_notinterface() {
- network_get_device ifname "$1" ||
return
+ network_get_device ifname "$1" ||
ifname="$1"
xappend "--except-interface=$ifname"
}
xappend "--except-interface=$ifname"
}
@@
-142,6
+162,10
@@
append_pxe_service() {
xappend "--pxe-service=$1"
}
xappend "--pxe-service=$1"
}
+append_interface_name() {
+ xappend "--interface-name=$1,$2"
+}
+
filter_dnsmasq() {
local cfg="$1" func="$2" match_cfg="$3" found_cfg
filter_dnsmasq() {
local cfg="$1" func="$2" match_cfg="$3" found_cfg
@@
-252,7
+276,7
@@
dhcp_match_add() {
dhcp_host_add() {
local cfg="$1"
dhcp_host_add() {
local cfg="$1"
- local hosttag nametime addrs
+ local hosttag nametime addrs
duids macs tags
config_get_bool force "$cfg" force 0
config_get_bool force "$cfg" force 0
@@
-270,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
@@
-280,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
@@
-298,7
+321,11
@@
dhcp_host_add() {
fi
if [ -n "$hostid" ]; then
fi
if [ -n "$hostid" ]; then
- hex_to_hostid hostid "$hostid"
+ hex_to_hostid hostid "$hostid"
+ fi
+
+ if [ -n "$tag" ]; then
+ for t in $tag; do append tags "$t" ",set:"; done
fi
config_get_bool broadcast "$cfg" broadcast 0
fi
config_get_bool broadcast "$cfg" broadcast 0
@@
-306,7
+333,7
@@
dhcp_host_add() {
[ "$broadcast" = "0" ] && broadcast= || broadcast=",set:needs-broadcast"
[ "$broadcast" = "0" ] && broadcast= || broadcast=",set:needs-broadcast"
- hosttag="${networkid:+,set:${networkid}}${tag
:+,set:${tag
}}$broadcast"
+ hosttag="${networkid:+,set:${networkid}}${tag
s:+,set:${tags
}}$broadcast"
nametime="${name:+,$name}${leasetime:+,$leasetime}"
if [ $DNSMASQ_DHCP_VER -eq 6 ]; then
nametime="${name:+,$name}${leasetime:+,$leasetime}"
if [ $DNSMASQ_DHCP_VER -eq 6 ]; then
@@
-333,14
+360,14
@@
dhcp_this_host_add() {
if [ "$mode" -gt 1 ] ; then
if [ "$mode" -gt 2 ] ; then
if [ "$mode" -gt 3 ] ; then
if [ "$mode" -gt 1 ] ; then
if [ "$mode" -gt 2 ] ; then
if [ "$mode" -gt 3 ] ; then
-
xappend "--interface-name=$ifdashname.$routername.$DOMAIN,
$ifname"
+
append_interface_name "$ifdashname.$routername.$DOMAIN" "
$ifname"
fi
fi
-
xappend "--interface-name=$routername.$DOMAIN,
$ifname"
+
append_interface_name "$routername.$DOMAIN" "
$ifname"
fi
# All IP addresses discovered by dnsmasq will be labeled (except fe80::)
fi
# All IP addresses discovered by dnsmasq will be labeled (except fe80::)
-
xappend "--interface-name=$routername,
$ifname"
+
append_interface_name "$routername" "
$ifname"
else
# This uses a static host file entry for only limited addresses.
else
# This uses a static host file entry for only limited addresses.
@@
-357,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
@@
-423,6
+450,7
@@
dhcp_add() {
local cfg="$1"
local dhcp6range="::"
local nettag
local cfg="$1"
local dhcp6range="::"
local nettag
+ local tags
config_get net "$cfg" interface
[ -n "$net" ] || return 0
config_get net "$cfg" interface
[ -n "$net" ] || return 0
@@
-430,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"
@@
-444,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
@@
-466,11
+495,20
@@
dhcp_add() {
config_get ra "$cfg" ra
config_get ra_management "$cfg" ra_management
config_get ra_preference "$cfg" ra_preference
config_get ra "$cfg" ra
config_get ra_management "$cfg" ra_management
config_get ra_preference "$cfg" ra_preference
+ config_get dns "$cfg" dns
+
+ config_list_foreach "$cfg" "interface_name" append_interface_name "$ifname"
# Put the router host name on this DHCP served interface address(es)
dhcp_this_host_add "$net" "$ifname" "$ADD_LOCAL_FQDN"
start="$( dhcp_calc "$start" )"
# Put the router host name on this DHCP served interface address(es)
dhcp_this_host_add "$net" "$ifname" "$ADD_LOCAL_FQDN"
start="$( dhcp_calc "$start" )"
+
+ add_tag() {
+ tags="${tags}tag:$1,"
+ }
+ config_list_foreach "$cfg" tag add_tag
+
nettag="${networkid:+set:${networkid},}"
if [ "$limit" -gt 0 ] ; then
nettag="${networkid:+set:${networkid},}"
if [ "$limit" -gt 0 ] ; then
@@
-488,7
+526,7
@@
dhcp_add() {
if [ "$dhcpv4" != "disabled" ] ; then
if [ "$dhcpv4" != "disabled" ] ; then
- xappend "--dhcp-range=$nettag$START,$END,$NETMASK,$leasetime${options:+ $options}"
+ xappend "--dhcp-range=$
tags$
nettag$START,$END,$NETMASK,$leasetime${options:+ $options}"
fi
fi
@@
-533,9
+571,19
@@
dhcp_add() {
xappend "--dhcp-range=$nettag$dhcp6range,constructor:$ifname,slaac,ra-names,$leasetime"
;;
esac
xappend "--dhcp-range=$nettag$dhcp6range,constructor:$ifname,slaac,ra-names,$leasetime"
;;
esac
+
+ if [ -n "$dns" ]; then
+ dnss=""
+ for d in $dns; do append dnss "[$d]" ","; done
+ else
+ dnss="[::]"
+ fi
+
+ dhcp_option_append "option6:dns-server,$dnss" "$networkid"
fi
fi
- dhcp_option_add "$cfg" "$networkid"
+ dhcp_option_add "$cfg" "$networkid" 0
+ dhcp_option_add "$cfg" "$networkid" 2
}
dhcp_option_append() {
}
dhcp_option_append() {
@@
-551,18
+599,20
@@
dhcp_option_add() {
local cfg="$1"
local networkid="$2"
local force="$3"
local cfg="$1"
local networkid="$2"
local force="$3"
+ local opt="dhcp_option"
[ "$force" = "0" ] && force=
[ "$force" = "0" ] && force=
+ [ "$force" = "2" ] && opt="dhcp_option_force"
local list_len
local list_len
- config_get list_len "$cfg"
dhcp_option_LENGTH
+ config_get list_len "$cfg"
"${opt}_LENGTH"
if [ -n "$list_len" ]; then
if [ -n "$list_len" ]; then
- config_list_foreach "$cfg"
dhcp_option
dhcp_option_append "$networkid" "$force"
+ config_list_foreach "$cfg"
"$opt"
dhcp_option_append "$networkid" "$force"
else
else
- config_get dhcp_option "$cfg"
dhcp_option
+ config_get dhcp_option "$cfg"
"$opt"
- [ -n "$dhcp_option" ] && echo "Warning: the 'option
dhcp_option' syntax is deprecated, use 'list dhcp_option
'" >&2
+ [ -n "$dhcp_option" ] && echo "Warning: the 'option
$opt' syntax is deprecated, use 'list $opt
'" >&2
local option
for option in $dhcp_option; do
local option
for option in $dhcp_option; do
@@
-585,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() {
@@
-680,7
+730,7
@@
dhcp_relay_add() {
dnsmasq_start()
{
dnsmasq_start()
{
- local cfg="$1" disabled resolvfile
+ local cfg="$1" disabled resolvfile
user_dhcpscript
config_get_bool disabled "$cfg" disabled 0
[ "$disabled" -gt 0 ] && return 0
config_get_bool disabled "$cfg" disabled 0
[ "$disabled" -gt 0 ] && return 0
@@
-691,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
@@
-701,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
@@
-764,7
+817,7
@@
dnsmasq_start()
config_get tftp_root "$cfg" "tftp_root"
[ -n "$tftp_root" ] && mkdir -p "$tftp_root" && append_bool "$cfg" enable_tftp "--enable-tftp"
append_bool "$cfg" tftp_no_fail "--tftp-no-fail"
config_get tftp_root "$cfg" "tftp_root"
[ -n "$tftp_root" ] && mkdir -p "$tftp_root" && append_bool "$cfg" enable_tftp "--enable-tftp"
append_bool "$cfg" tftp_no_fail "--tftp-no-fail"
- append_bool "$cfg" nonwildcard "--bind-dynamic"
+ append_bool "$cfg" nonwildcard "--bind-dynamic"
1
append_bool "$cfg" fqdn "--dhcp-fqdn"
append_bool "$cfg" proxydnssec "--proxy-dnssec"
append_bool "$cfg" localservice "--local-service"
append_bool "$cfg" fqdn "--dhcp-fqdn"
append_bool "$cfg" proxydnssec "--proxy-dnssec"
append_bool "$cfg" localservice "--local-service"
@@
-775,7
+828,7
@@
dnsmasq_start()
append_bool "$cfg" noping "--no-ping"
append_parm "$cfg" logfacility "--log-facility"
append_bool "$cfg" noping "--no-ping"
append_parm "$cfg" logfacility "--log-facility"
- append_parm "$cfg" dhcpscript "--dhcp-script"
+
append_parm "$cfg" cachesize "--cache-size"
append_parm "$cfg" dnsforwardmax "--dns-forward-max"
append_parm "$cfg" port "--port"
append_parm "$cfg" cachesize "--cache-size"
append_parm "$cfg" dnsforwardmax "--dns-forward-max"
append_parm "$cfg" port "--port"
@@
-786,7
+839,9
@@
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" "server" append_server
+ config_list_foreach "$cfg" "rev_server" append_rev_server
config_list_foreach "$cfg" "address" append_address
config_list_foreach "$cfg" "ipset" append_ipset
config_list_foreach "$cfg" "interface" append_interface
config_list_foreach "$cfg" "address" append_address
config_list_foreach "$cfg" "ipset" append_ipset
config_list_foreach "$cfg" "interface" append_interface
@@
-815,7
+870,10
@@
dnsmasq_start()
config_get_bool readethers "$cfg" readethers
[ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers
config_get_bool readethers "$cfg" readethers
[ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers
- config_get dhcpscript $cfg dhcpscript
+ config_get user_dhcpscript $cfg dhcpscript
+ if has_handler || [ -n "$user_dhcpscript" ]; then
+ xappend "--dhcp-script=$DHCPSCRIPT"
+ fi
config_get leasefile $cfg leasefile "/tmp/dhcp.leases"
[ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"
config_get leasefile $cfg leasefile "/tmp/dhcp.leases"
[ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"
@@
-876,14
+934,16
@@
dnsmasq_start()
}
dhcp_option_add "$cfg" "" 0
}
dhcp_option_add "$cfg" "" 0
+ dhcp_option_add "$cfg" "" 2
xappend "--dhcp-broadcast=tag:needs-broadcast"
xappend "--addn-hosts=$(dirname $HOSTFILE)"
config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d"
xappend "--dhcp-broadcast=tag:needs-broadcast"
xappend "--addn-hosts=$(dirname $HOSTFILE)"
config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d"
- [ ! -d "$dnsmasqconfdir" ] && mkdir -p $dnsmasqconfdir
xappend "--conf-dir=$dnsmasqconfdir"
xappend "--conf-dir=$dnsmasqconfdir"
+ dnsmasqconfdir="${dnsmasqconfdir%%,*}"
+ [ ! -d "$dnsmasqconfdir" ] && mkdir -p $dnsmasqconfdir
xappend "--user=dnsmasq"
xappend "--group=dnsmasq"
echo >> $CONFIGFILE_TMP
xappend "--user=dnsmasq"
xappend "--group=dnsmasq"
echo >> $CONFIGFILE_TMP
@@
-940,6
+1000,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
@@
-955,15
+1016,11
@@
dnsmasq_start()
procd_open_instance $cfg
procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}".pid
procd_set_param file $CONFIGFILE
procd_open_instance $cfg
procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}".pid
procd_set_param file $CONFIGFILE
+ [ -n "$user_dhcpscript" ] && procd_set_param env USER_DHCPSCRIPT="$user_dhcpscript"
procd_set_param respawn
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 dnsmasq ubus log
- procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $
dhcpscript /etc/hosts /etc/ethers $EXTRA_MOUN
T
+ 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 $DHCPSCRIP
T
procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
procd_close_instance
procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
procd_close_instance
@@
-971,7
+1028,7
@@
dnsmasq_start()
dnsmasq_stop()
{
dnsmasq_stop()
{
- local cfg="$1"
+ local cfg="$1"
resolvfile
config_get resolvfile "$cfg" "resolvfile"
config_get resolvfile "$cfg" "resolvfile"
@@
-986,24
+1043,28
@@
dnsmasq_stop()
rm -f ${BASEDHCPSTAMPFILE}.${cfg}.*.dhcp
}
rm -f ${BASEDHCPSTAMPFILE}.${cfg}.*.dhcp
}
-
service_triggers
()
+
add_interface_trigger
()
{
{
- procd_add_reload_trigger "dhcp"
- procd_add_raw_trigger "interface.*" 2000 /etc/init.d/dnsmasq reload
+ local interface ignore
+
+ config_get interface "$1" interface
+ config_get_bool ignore "$1" ignore 0
+
+ [ -n "$interface" -a $ignore -eq 0 ] && procd_add_interface_trigger "interface.*" "$interface" /etc/init.d/dnsmasq reload
}
}
-
boot
()
+
service_triggers
()
{
{
- BOOT=1
- start "$@"
+ procd_add_reload_trigger "dhcp" "system"
+
+ config_load dhcp
+ config_foreach add_interface_trigger dhcp
}
start_service() {
local instance="$1"
local instance_found=0
}
start_service() {
local instance="$1"
local instance_found=0
- [ -n "$BOOT" ] && return
-
. /lib/functions/network.sh
config_cb() {
. /lib/functions/network.sh
config_cb() {
@@
-1028,7
+1089,7
@@
start_service() {
reload_service() {
rc_procd start_service "$@"
reload_service() {
rc_procd start_service "$@"
- return 0
+ procd_send_signal dnsmasq "$@"
}
stop_service() {
}
stop_service() {