diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-07-29 14:56:35 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-07-29 16:41:09 +0200 |
| commit | a1681ce39bbbab20c46150ee28b63351396662c2 (patch) | |
| tree | 261159bcccd6a9c9ed32d8e4ee6c144bdb082a85 | |
| parent | 6916ca8d33db0ab11434a8fb45f72abd70065c5e (diff) | |
| download | upstream-a1681ce39bbbab20c46150ee28b63351396662c2.tar.gz upstream-a1681ce39bbbab20c46150ee28b63351396662c2.tar.bz2 upstream-a1681ce39bbbab20c46150ee28b63351396662c2.zip | |
dnsmasq: replace the iface hotplug script with a procd trigger
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | package/network/services/dnsmasq/Makefile | 2 | ||||
| -rw-r--r-- | package/network/services/dnsmasq/files/dnsmasq.hotplug | 5 | ||||
| -rw-r--r-- | package/network/services/dnsmasq/files/dnsmasq.init | 12 |
3 files changed, 8 insertions, 11 deletions
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 3aff519e6b..d5acef578e 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -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 diff --git a/package/network/services/dnsmasq/files/dnsmasq.hotplug b/package/network/services/dnsmasq/files/dnsmasq.hotplug deleted file mode 100644 index ca5d10c2ed..0000000000 --- a/package/network/services/dnsmasq/files/dnsmasq.hotplug +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -[ "$ACTION" = ifup ] || exit 0 - -/etc/init.d/dnsmasq enabled && /etc/init.d/dnsmasq start diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 0941f87fa8..4047768bba 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -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 |