summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2019-06-28 09:48:11 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-06-28 10:07:10 +0200
commit3d5fbf5e6649a607900bb840adf0efa2bd042311 (patch)
treefa9456cf9732df8364d94cf5abbdb45559d077cc
parente44820e2f0f5c79dfaa225b9fbcc18af6bc45df8 (diff)
downloadptxdist-3d5fbf5e6649a607900bb840adf0efa2bd042311.tar.gz
ptxdist-3d5fbf5e6649a607900bb840adf0efa2bd042311.tar.xz
dnsmasq: adapt package's '/var/lib' requirements
Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/dnsmasq.in9
-rw-r--r--rules/dnsmasq.make5
2 files changed, 9 insertions, 5 deletions
diff --git a/rules/dnsmasq.in b/rules/dnsmasq.in
index 65f68f738..aec63dd0f 100644
--- a/rules/dnsmasq.in
+++ b/rules/dnsmasq.in
@@ -5,9 +5,9 @@
menuconfig DNSMASQ
tristate
prompt "dnsmasq "
- select DBUS if DNSMASQ_DBUS
- select LUA if DNSMASQ_SCRIPT_LUA
- select ROOTFS_VAR_LIB
+ select DBUS if DNSMASQ_DBUS
+ select LUA if DNSMASQ_SCRIPT_LUA
+ select ROOTFS_VAR_LIB if DNSMASQ_DHCP && RUNTIME
help
A small caching DNS proxy and DHCP server.
@@ -23,6 +23,9 @@ menuconfig DNSMASQ
Note: In order to make dnsmasq work as DHCP, you have to enable
the following kernel features: FIXME
+ Note: on a read-only root filesystem this package still requires a
+ writable '/var/lib' for its leases database (DHCP feature enabled).
+
if DNSMASQ
comment "build options ---"
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index 861936329..d9a134cdf 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -104,9 +104,10 @@ endif
@$(call install_alternative, dnsmasq, 0, 0, 0644, /etc/dnsmasq.conf)
-# for the 'dnsmasq.leases' file
+ifdef PTXCONF_DNSMASQ_DHCP
+# # for the 'dnsmasq.leases' file
@$(call install_copy, dnsmasq, 0, 0, 0755, /var/lib/misc)
-
+endif
@$(call install_finish, dnsmasq)
@$(call touch)