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 eb97565859d48fe18cedbebde5cb669352aee49c..17c6509eef8ef82703e74a97e585ee604e4ed196 100755 (executable)
--- a/ldap/admin/src/scripts/start-dirsrv.in
+++ b/ldap/admin/src/scripts/start-dirsrv.in
@@ -36,7 +36,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 -l
+        /bin/systemctl start @package_name@@$SERV_ID.service -l
         if [ $? -ne 0 ]; then
             return 1
         fi

diff --git a/ldap/admin/src/scripts/status-dirsrv.in b/ldap/admin/src/scripts/status-dirsrv.in
index 86b7d4a491511834bf7574d98661031cbba0d262..4f2cb7185519a0beeb1340265bbd73c06fa1f368 100755 (executable)
--- a/ldap/admin/src/scripts/status-dirsrv.in
+++ b/ldap/admin/src/scripts/status-dirsrv.in
@@ -27,7 +27,7 @@ status_instance() {
     # Use systemctl if available.
     #
     if [ -d "@systemdsystemunitdir@" ] && [ $(id -u) -eq 0 ];then
-        @bindir@/systemctl status @package_name@@$SERV_ID.service -l --no-pager
+        /bin/systemctl status @package_name@@$SERV_ID.service -l --no-pager
         rv=$?
         if [ $rv -ne 0 ]; then
             return 1
@@ -69,7 +69,7 @@ if [ $# -eq 0 ]; then
     # Use systemctl if available and running as root,
     #
     if [ -d "@systemdsystemunitdir@" ] && [ $(id -u) -eq 0 ];then
-        @bindir@/systemctl status @package_name@@*.service -l --no-pager
+        /bin/systemctl status @package_name@@*.service -l --no-pager
         ret=$?
         if [ $? -ne 0 ]; then
             return 1

diff --git a/ldap/admin/src/scripts/stop-dirsrv.in b/ldap/admin/src/scripts/stop-dirsrv.in
index c2f7cdd0050859efca7eda03ace060e81b4db43d..90aba9943e8c243d04b97fdcf125b48b6dbbb121 100755 (executable)
--- a/ldap/admin/src/scripts/stop-dirsrv.in
+++ b/ldap/admin/src/scripts/stop-dirsrv.in
@@ -27,12 +27,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 -l
+            /bin/systemctl stop @package_name@@$SERV_ID.service -l
         else
             # 
             # Have to kill it since systemctl doesn't think it's running