fix-systemctl-path

Gbp-Pq: Name fix-systemctl-path.diff

diff --git a/ldap/admin/src/scripts/start-dirsrv.in b/ldap/admin/src/scripts/start-dirsrv.in
index 70336bafb95b0fb637a6a6cd617f43ec6c2497fe..d9d4e305a828fa0a78bd58daf1434e46ae2e05ca 100755 (executable)
--- a/ldap/admin/src/scripts/start-dirsrv.in
+++ b/ldap/admin/src/scripts/start-dirsrv.in
@@ -55,7 +55,7 @@ start_instance() {
     # otherwise start the instance the old way.
     #
     if [ -d "@systemdsystemunitdir@" ] && [ $(id -u) -eq 0 ];then
-        @bindir@/systemctl start @package_name@@$SERV_ID.service
+        /bin/systemctl start @package_name@@$SERV_ID.service
         if [ $? -ne 0 ]; then
             return 1
         fi

diff --git a/ldap/admin/src/scripts/stop-dirsrv.in b/ldap/admin/src/scripts/stop-dirsrv.in
index 41ffb6ccd023d0186277255cf4d4e1622f8b1b47..40f6d2863c9c45c5ac28c88b119462c4893181d8 100755 (executable)
--- a/ldap/admin/src/scripts/stop-dirsrv.in
+++ b/ldap/admin/src/scripts/stop-dirsrv.in
@@ -43,12 +43,12 @@ stop_instance() {
         # 
         # Now, check if systemctl is aware of this running instance
         #
-        @bindir@/systemctl is-active @package_name@@$SERV_ID.service > /dev/null 2>&1
+        /bin/systemctl is-active @package_name@@$SERV_ID.service > /dev/null 2>&1
         if [ $? -eq 0 ]; then
             # 
             # systemctl sees the running process, so stop it correctly
             #
-            @bindir@/systemctl stop @package_name@@$SERV_ID.service
+            /bin/systemctl stop @package_name@@$SERV_ID.service
         else
             # 
             # Have to kill it since systemctl doesn't think it's running