When I created ipa.init I did it initially by copying the dirsrv init
script.
Remove any remaining reference to the dirsrv stuff.

Ticket: #857

Simo.

-- 
Simo Sorce * Red Hat, Inc * New York
>From fc87f8d93bbd9dfeabd6301ef2b9ae7c67030703 Mon Sep 17 00:00:00 2001
From: Simo Sorce <sso...@redhat.com>
Date: Thu, 27 Jan 2011 11:39:24 -0500
Subject: [PATCH] Fix ipa init script to not depend on dirsrv init internals

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

diff --git a/ipa.init b/ipa.init
index 92c9f49185b3032f7dfda9d740546c4c882f9c76..b5a43c31942596c99ee4ef2d00385536cacb9052 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}"
-- 
1.7.3.5

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to