From 442d6ad30ce1156914e6245aa7502499e50ec0da Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce@redhat.com>
Date: Thu, 27 Jan 2011 11:39:24 -0500
Subject: Fix ipa init script to not depend on dirsrv init internals

Fixes: https://fedorahosted.org/freeipa/ticket/857
---
 ipa.init | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'ipa.init')

diff --git a/ipa.init b/ipa.init
index 92c9f4918..b5a43c319 100755
--- a/ipa.init
+++ b/ipa.init
@@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# ipa    This starts and stops ipa
+# ipa    This starts and stops ipa controlled daemons
 #
 # chkconfig:   - 21 79
 # description: IPA Server
-# processname: /usr/sbin/ns-slapd
 # configdir:   /etc/ipa/
-# piddir:      /var/run/dirsrv
 #
 
 # Source function library.
@@ -25,19 +23,14 @@ then
     exit 0
 fi
 
-# Lockfile
-if [ -d "/var/lock/subsys" ] ; then
-    lockfile="/var/lock/subsys/dirsrv"
-else
-    lockfile="/var/lock/dirsrv/lock"
-fi
-
 case "$1" in
     start|stop|restart|status)
         /usr/sbin/ipactl $1
         ;;
     condrestart)
-        [ ! -f $lockfile ] || /usr/sbin/ipactl restart
+        /sbin/service dirsrv status
+        RETVAL=$?
+        [ $RETVAL = 0 ] && /usr/sbin/ipactl restart
         ;;
     *)
         echo "Usage: $0 {start|stop|status|restart|condrestart}"
-- 
cgit