From: Martin Winter <mwinter@opensourcerouting.org>
Date: Mon, 19 Mar 2018 18:16:09 +0000 (-0700)
Subject: debianpkg: Fix maintainer-script-should-not-use-recursive-chown-or-chmod
X-Git-Tag: frr-5.0-dev~114^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e681915e6488e4287e9a0eeddafcc3c7662084c1;p=matthieu%2Ffrr.git

debianpkg: Fix maintainer-script-should-not-use-recursive-chown-or-chmod

New lintian version causes warning for recursive chown and chmod. This
change avoids the the recursive operation by splitting it into to commands

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
---

diff --git a/debianpkg/frr.postinst b/debianpkg/frr.postinst
index cbc45f03eb..972f8c0500 100644
--- a/debianpkg/frr.postinst
+++ b/debianpkg/frr.postinst
@@ -12,7 +12,8 @@ frrvtygid=`egrep "^frrvty:" $GROUPFILE | awk -F ":" '{ print $3 }'`
 [ -n ${frrgid} ]    || (echo "No gid for frr in ${GROUPFILE}"    && /bin/false)
 [ -n ${frrVTYgid} ] || (echo "No gid for frrvty in ${GROUPFILE}" && /bin/false)
 
-chown -R ${frruid}:${frrgid} /etc/frr
+chown ${frruid}:${frrgid} /etc/frr
+chown ${frruid}:${frrgid} /etc/frr/*
 touch /etc/frr/vtysh.conf
 chgrp ${frrvtygid} /etc/frr/vtysh*
 chmod 644 /etc/frr/*
diff --git a/debianpkg/frr.preinst b/debianpkg/frr.preinst
index 467bea9718..477e690d0a 100644
--- a/debianpkg/frr.preinst
+++ b/debianpkg/frr.preinst
@@ -39,14 +39,16 @@ if [ "$1" = "install" ]; then
   # Logfiles are group readable in case users were put into the frr group.
   d=/var/log/frr/
     mkdir -p $d
-    chown -R frr:frr $d
+    chown frr:frr $d
+    chown --quiet frr:frr $d/* | true
     chmod u=rwx,go=rx $d
     find $d -type f -print0 | xargs -0 --no-run-if-empty   chmod u=rw,g=r,o=
 
   # Strict permissions for the sockets.
   d=/var/run/frr/
     mkdir -p $d
-    chown -R frr:frr $d
+    chown frr:frr $d
+    chown --quiet frr:frr $d/* | true
     chmod u=rwx,go=rx $d
     find $d -type f -print0 | xargs -0 --no-run-if-empty   chmod u=rw,go=