zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / debianpkg / frr.preinst

diff --git a/debianpkg/frr.preinst b/debianpkg/frr.preinst
index 29162e3b56a92bab011cf527d0ed0d29a35280b7..477e690d0aac4896bf760d605d856bf590c00e55 100644 (file)
--- a/debianpkg/frr.preinst
+++ b/debianpkg/frr.preinst
@@ -30,7 +30,7 @@ fi
 # frr and as such we need to intelligently
 # check to see if the frr user is in the frrvty
 # group.
-if ! /usr/bin/id frr | grep &>/dev/null 'frrvty'; then
+if ! id frr | grep &>/dev/null 'frrvty'; then
     usermod -a -G frrvty frr >/dev/null
 fi
 
@@ -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=