From: Debian 389ds Team <pkg-fedora-ds-maintainers@lists.alioth.debian.org>
Date: Wed, 10 May 2017 06:25:03 +0000 (+0100)
Subject: fix-systemctl-path
X-Git-Tag: archive/raspbian/1.4.0.19-3+rpi1~1^2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c5f9b367d9f382efe5440fa542bf12035c57f2b4;p=389-ds-base.git

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 70336ba..d9d4e30 100755
--- 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 41ffb6c..40f6d28 100755
--- 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