diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2020-01-09 15:32:12 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2020-01-09 15:37:53 +0200 |
| commit | 6a2855212096d2c486961a0841b037bae4b75de7 (patch) | |
| tree | 8f8fa00f6db83e66e7cc79341c870d292ad8082c | |
| parent | 8f0effc462e2c7467e4056c2cb09d9e1da078088 (diff) | |
| download | upstream-6a2855212096d2c486961a0841b037bae4b75de7.tar.gz upstream-6a2855212096d2c486961a0841b037bae4b75de7.tar.bz2 upstream-6a2855212096d2c486961a0841b037bae4b75de7.zip | |
dnsmasq: add uci-defaults script for config migration
When running sysupgrade from an existing configuration, UCI option
dhcp.@dnsmasq[0].resolvfile needs to be modified in case it has not
been changed from it's original value.
Accomplish that using a uci-defaults script.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | package/network/services/dnsmasq/Makefile | 4 | ||||
| -rwxr-xr-x | package/network/services/dnsmasq/files/50-dnsmasq-migrate-resolv-conf-auto.sh | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index d1e0c34e97..60d16f3496 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_UPSTREAM_VERSION:=2.80 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION))) -PKG_RELEASE:=17 +PKG_RELEASE:=18 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq @@ -178,6 +178,8 @@ define Package/dnsmasq/install $(INSTALL_BIN) ./files/dhcp-script.sh $(1)/usr/lib/dnsmasq/dhcp-script.sh $(INSTALL_DIR) $(1)/usr/share/acl.d $(INSTALL_DATA) ./files/dnsmasq_acl.json $(1)/usr/share/acl.d/ + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files/50-dnsmasq-migrate-resolv-conf-auto.sh $(1)/etc/uci-defaults endef Package/dnsmasq-dhcpv6/install = $(Package/dnsmasq/install) diff --git a/package/network/services/dnsmasq/files/50-dnsmasq-migrate-resolv-conf-auto.sh b/package/network/services/dnsmasq/files/50-dnsmasq-migrate-resolv-conf-auto.sh new file mode 100755 index 0000000000..c78faa112d --- /dev/null +++ b/package/network/services/dnsmasq/files/50-dnsmasq-migrate-resolv-conf-auto.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +[ "$(uci get dhcp.@dnsmasq[0].resolvfile)" = "/tmp/resolv.conf.auto" ] && { + uci set dhcp.@dnsmasq[0].resolvfile="/tmp/resolv.conf.d/resolv.conf.auto" + uci commit dhcp +} |