mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Juergen Borleis <jbe@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v3 05/10] dnsmasq: adapt package's '/var/lib' requirements
Date: Fri, 28 Jun 2019 09:48:11 +0200	[thread overview]
Message-ID: <20190628074816.10115-6-jbe@pengutronix.de> (raw)
In-Reply-To: <20190628074816.10115-1-jbe@pengutronix.de>

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 rules/dnsmasq.in   | 9 ++++++---
 rules/dnsmasq.make | 5 +++--
 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)
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

  parent reply	other threads:[~2019-06-28  7:48 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-28  7:48 [ptxdist] '/var/ handling Juergen Borleis
2019-06-28  7:48 ` [ptxdist] [PATCH v3 01/10] rootfs: keep /var writable, even if the rootfs is read-only Juergen Borleis
2019-06-28  7:48 ` [ptxdist] [PATCH v3 02/10] conman: adapt package's '/var/lib' requirements Juergen Borleis
2019-06-28  7:48 ` [ptxdist] [PATCH v3 03/10] networkmanager: " Juergen Borleis
2019-06-28  7:48 ` [ptxdist] [PATCH v3 04/10] ntp: adapt package's '/var/lib' and '/var/log' requirements Juergen Borleis
2019-06-28  7:48 ` Juergen Borleis [this message]
2019-06-28  7:48 ` [ptxdist] [PATCH v3 06/10] mariadb: adapt package's '/var/lib' requirements Juergen Borleis
2019-06-28  7:48 ` [ptxdist] [PATCH v3 07/10] samba: adapt package's '/var/lib' and '/var/cache' requirements Juergen Borleis
2019-06-28  7:48 ` [ptxdist] [PATCH v3 08/10] samba: show SysV related menue on demand only Juergen Borleis
2019-06-28  7:48 ` [ptxdist] [PATCH v3 09/10] nfsutils: adapt package's '/var/lib' requirements Juergen Borleis
2019-06-28  7:48 ` [ptxdist] [PATCH v3 10/10] logrotate: " Juergen Borleis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190628074816.10115-6-jbe@pengutronix.de \
    --to=jbe@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox