Skip to contentSkip to conversation

package/quagga: Fix directories and permissions

PATCH Superseded Nathaniel Roach 2 participants 3 messages May 13, 2016 – May 14, 2016

lore
Share & tools
lore
#0 lore raw

PATCH v3 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

Changes v2 -> v3:
- Removed extra whitespace
- Removed redundant makedev on /var/run
(Both Thomas)

---
 package/quagga/quagga.mk            | 28 +++++++++++++++++++++++++++-
 package/quagga/quagga_tmpfiles.conf |  1 +
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 package/quagga/quagga_tmpfiles.conf
package/quagga/quagga.mk +27 -1
index 6b98367..419b502 100644
@@ -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,20 @@ 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 - - - - -
+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 +71,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 +1 -0
new file mode 100644
index 0000000..e16c475
@@ -0,0 +1 @@
+d /var/run/quagga/ 1755 quagga quagga -
Signature · 1 line
2.8.1
#1 lore raw

PATCH v3 1/1 package/quagga: Fix directories and permissions

Hello,

Quoted 6 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).

Quoted 6 lines

---
Changes v1 -> v2:
- Minor nits (Thomas)
- Add some comments about why permissions are changed as such

Applied to master, thanks. However, I still think that an init script would be useful: the default for Buildroot is to use the Busybox init, and as it is today, nothing is starting quagga and making sure that /var/run/quagga is owned by the quagga user.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH v3 1/1 package/quagga: Fix directories and permissions

Hi Thomas,

I agree, however I'm not using busybox init on any of my systems and don't feel capable of writing an init script without just copying someone else's implementation completely.

Quoted 16 lines · Thomas Petazzoni

Hello,

Quoted 6 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).

Quoted 6 lines

---
Changes v1 -> v2:
- Minor nits (Thomas)
- Add some comments about why permissions are changed as such

Quoted 10 lines

Applied to master, thanks. However, I still think that an init script would be useful: the default for Buildroot is to use the Busybox init, and as it is today, nothing is starting quagga and making sure that /var/run/quagga is owned by the quagga user.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160514/b0d82bfc/attachment.html>