mirror of https://github.com/hak5/openwrt.git
dnsmasq: replace the iface hotplug script with a procd trigger
Signed-off-by: Felix Fietkau <nbd@nbd.name>
parent
6916ca8d33
commit
a1681ce39b
|
@ -145,8 +145,6 @@ define Package/dnsmasq/install
|
|||
$(INSTALL_DATA) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf
|
||||
$(INSTALL_DIR) $(1)/etc/init.d
|
||||
$(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq
|
||||
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
|
||||
$(INSTALL_DATA) ./files/dnsmasq.hotplug $(1)/etc/hotplug.d/iface/25-dnsmasq
|
||||
$(INSTALL_DIR) $(1)/etc/hotplug.d/ntp
|
||||
$(INSTALL_DATA) ./files/dnsmasqsec.hotplug $(1)/etc/hotplug.d/ntp/25-dnsmasqsec
|
||||
endef
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
[ "$ACTION" = ifup ] || exit 0
|
||||
|
||||
/etc/init.d/dnsmasq enabled && /etc/init.d/dnsmasq start
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh /etc/rc.common
|
||||
# Copyright (C) 2007-2012 OpenWrt.org
|
||||
|
||||
START=60
|
||||
START=19
|
||||
|
||||
USE_PROCD=1
|
||||
PROG=/usr/sbin/dnsmasq
|
||||
|
@ -622,14 +622,18 @@ dhcp_relay_add() {
|
|||
service_triggers()
|
||||
{
|
||||
procd_add_reload_trigger "dhcp"
|
||||
procd_add_raw_trigger "interface.*" 2000 /etc/init.d/dnsmasq reload
|
||||
}
|
||||
|
||||
boot() {
|
||||
# Will be launched through hotplug
|
||||
return 0
|
||||
boot()
|
||||
{
|
||||
BOOT=1
|
||||
start "$@"
|
||||
}
|
||||
|
||||
start_service() {
|
||||
[ -n "$BOOT" ] && return
|
||||
|
||||
include /lib/functions
|
||||
|
||||
config_load dhcp
|
||||
|
|
Loading…
Reference in New Issue