Blame SOURCES/0010-moving-executables.patch

dfe9c0
diff --git a/tools/frr.service b/tools/frr.service
dfe9c0
index aa45f42..a3f0103 100644
dfe9c0
--- a/tools/frr.service
dfe9c0
+++ b/tools/frr.service
dfe9c0
@@ -17,9 +17,9 @@ WatchdogSec=60s
dfe9c0
 RestartSec=5
dfe9c0
 Restart=on-abnormal
dfe9c0
 LimitNOFILE=1024
dfe9c0
-ExecStart=/usr/lib/frr/frrinit.sh start
dfe9c0
-ExecStop=/usr/lib/frr/frrinit.sh stop
dfe9c0
-ExecReload=/usr/lib/frr/frrinit.sh reload
dfe9c0
+ExecStart=/usr/libexec/frr/frrinit.sh start
dfe9c0
+ExecStop=/usr/libexec/frr/frrinit.sh stop
dfe9c0
+ExecReload=/usr/libexec/frr/frrinit.sh reload
dfe9c0
 
dfe9c0
 [Install]
dfe9c0
 WantedBy=multi-user.target
dfe9c0
diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in
dfe9c0
index 9a144b2..a334d95 100644
dfe9c0
--- a/tools/frrcommon.sh.in
dfe9c0
+++ b/tools/frrcommon.sh.in
dfe9c0
@@ -59,6 +59,9 @@ chownfrr() {
dfe9c0
 	[ -n "$FRR_USER" ] && chown "$FRR_USER" "$1"
dfe9c0
 	[ -n "$FRR_GROUP" ] && chgrp "$FRR_GROUP" "$1"
dfe9c0
 	[ -n "$FRR_CONFIG_MODE" ] && chmod "$FRR_CONFIG_MODE" "$1"
dfe9c0
+	if [ -d "$1" ]; then
dfe9c0
+		chmod gu+x "$1"
dfe9c0
+	fi
dfe9c0
 }
dfe9c0
 
dfe9c0
 vtysh_b () {
dfe9c0
@@ -152,7 +155,7 @@ daemon_start() {
dfe9c0
 	daemon_prep "$daemon" "$inst" || return 1
dfe9c0
 	if test ! -d "$V_PATH"; then
dfe9c0
 		mkdir -p "$V_PATH"
dfe9c0
-		chown frr "$V_PATH"
dfe9c0
+		chownfrr "$V_PATH"
dfe9c0
 	fi
dfe9c0
 
dfe9c0
 	eval wrap="\$${daemon}_wrap"