package/quagga: Fix directories and permissions
PATCH v2 1/1 package/quagga: Fix directories and permissions
Quagga runs as the "quagga" user, but it also needs to modify files in /etc and /var - config files, pid files and vty sockets for vtysh.
Tell the configure script the right folders to use, create the user, fix the permissions, and then let systemd know (if needed).
---
Changes v1 -> v2:
- Minor nits (Thomas)
- Add some comments about why permissions are changed as such
--- package/quagga/quagga.mk | 29 ++++++++++++++++++++++++++++- package/quagga/quagga_tmpfiles.conf | 2 ++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 package/quagga/quagga_tmpfiles.conf
package/quagga/quagga.mk +28 -1
@@ -10,7 +10,14 @@ QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga QUAGGA_DEPENDENCIES = host-gawk QUAGGA_LICENSE = GPLv2+ QUAGGA_LICENSE_FILES = COPYING -QUAGGA_CONF_OPTS = --program-transform-name='' + +# We need to override these directories so that quagga can create +# files as the quagga user without extra intervention +QUAGGA_CONF_OPTS = \ + --program-transform-name='' \ + --sysconfdir=/etc/quagga \ + --localstatedir=/var/run/quagga + # 0002-configure-fix-static-linking-with-readline.patch QUAGGA_AUTORECONF = YES
@@ -33,6 +40,21 @@ QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_ISISD),--enable-isisd,--disable-is QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),--enable-bgp-announce,--disable-bgp-announce) QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZERBRA),--enable-tcp-zebra,--disable-tcp-zebra) +define QUAGGA_USERS + quagga -1 quagga -1 * - - - Quagga priv drop user +endef + +# Set the permissions of /etc/quagga such that quagga (through vtysh) can +# save the configuration - set the folder recursively as the files need to +# be 600, and then set the folder (non-recursively) to 755 so it can used. +# Quagga also needs to write to the folder as it moves and creates, rather +# than overwriting. +define QUAGGA_PERMISSIONS + /etc/quagga r 600 quagga quagga - - - - - + /etc/quagga d 755 quagga quagga - - - - - + /var/run/quagga d 755 quagga quagga - - - - - +endef + ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y) QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config QUAGGA_CONF_OPTS += --enable-snmp=agentx
@@ -50,4 +72,9 @@ ifeq ($(BR2_arc),y) QUAGGA_CONF_OPTS += --disable-pie endif +define QUAGGA_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/quagga/quagga_tmpfiles.conf \ + $(TARGET_DIR)/usr/lib/tmpfiles.d/quagga.conf +endef + $(eval $(autotools-package))
package/quagga/quagga_tmpfiles.conf new file +2 -0
@@ -0,0 +1,2 @@ +d /var/run/quagga/ 1755 quagga quagga - +
Signature · 1 line
2.8.1
[Buildroot] package/audit: Remove redundant mkdir
install -D creates the folder, so we don't need the mkdir command
--- package/audit/audit.mk | 1 - 1 file changed, 1 deletion(-)
package/audit/audit.mk +0 -1
@@ -46,7 +46,6 @@ define AUDIT_INSTALL_INIT_SYSTEMD ln -fs ../../../../usr/lib/systemd/system/auditd.service \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/auditd.service - mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d $(INSTALL) -D -m 644 package/audit/audit_tmpfiles.conf \ $(TARGET_DIR)/usr/lib/tmpfiles.d/audit.conf endef
Signature · 1 line
2.8.1
[Buildroot] package/audit: Remove redundant mkdir
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Nathaniel" == Nathaniel Roach <[email protected]> writes:
install -D creates the folder, so we don't need the mkdir command
Signed-off-by Nathaniel Roach <[email protected]>
Committed to next, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v2 1/1 package/quagga: Fix directories and permissions
In reply to Nathaniel RoachHello,
Quoted 7 lines · Nathaniel Roach
Quagga runs as the "quagga" user, but it also needs to modify files in /etc and /var - config files, pid files and vty sockets for vtysh.
Tell the configure script the right folders to use, create the user, fix the permissions, and then let systemd know (if needed).
Signed-off-by Nathaniel Roach <[email protected]>
Thanks for this new iteration. However, there's one thing that I missed in my review of the previous iteration.
package/quagga/quagga.mk QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_ISISD),--enable-isisd,--disable-is · line 56
Quoted 5 lines
package/quagga/quagga.mk +5
-0+define QUAGGA_PERMISSIONS + /etc/quagga r 600 quagga quagga - - - - - + /etc/quagga d 755 quagga quagga - - - - - + /var/run/quagga d 755 quagga quagga - - - - - +endef
I think setting permissions on /var/run/quagga here is useless. Indeed, /var/run is a symbolic link to /run, which is mounted at boot time as a tmpfs filesystem. I.e, the permissions set in <pkg>_PERMISSIONS (which affect the generated filesystem image) have no affect to the contents of /run.
Thanks to your tmpfiles.d thing, you probably haven't seen this if you're using systemd. But if you try to use the Busybox init, it won't work. Only an init script can adjust the permissions in /run.
So I believe this line should be removed.
BTW, what about adding a systemd service file and an init script for Quagga? Of course, I'm fine if it's done as part of a separate change, submitted later.
package/quagga/quagga_tmpfiles.conf line 2
Quoted 8 lines
package/quagga/quagga_tmpfiles.conf new file +2
-0@@ -0,0 +1,2 @@ +d /var/run/quagga/ 1755 quagga quagga - +
While you're at it, remove this extra empty line at the end of the file, I don't think it is needed.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com