initscript: Only use lockdir if existing.

Refs #5684
Icinga · Mar 3, 2014 · 3485855 · 3485855
1 parent 415aca8
commit 3485855
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/daemon-init.in b/daemon-init.in
@@ -57,12 +57,6 @@ if [ ! -f $IcingaCfgFile ]; then
 	exit 1
 fi
 
-# Check that lockdir exists.
-if [ ! -d $IcingaLockDir ]; then
-	echo "Lockfile dir $IcingaLockDir not found.  Exiting."
-	exit 1
-fi
-
 ## helper functions ##
 
 # check status if icinga daemon
@@ -194,7 +188,7 @@ start(){
 		$IcingaBin -d $IcingaCfgFile
 		bin_exit=$?
 	fi
-	touch $IcingaLockDir/$IcingaLockFile
+	if [ -d $IcingaLockDir ]; then touch $IcingaLockDir/$IcingaLockFile; fi
 	echo "Starting icinga done."
 	exit $bin_exit
 }

diff --git a/rc.ido2db.in b/rc.ido2db.in
@@ -86,12 +86,6 @@ if [ ! -f $Ido2dbCfgFile ]; then
 	exit 1
 fi
 
-# Check that
-if [ ! -d $Ido2dbLockDir ]; then
-	echo "Lockfile dir $Ido2dbLockDir not found.  Exiting."
-	exit 1
-fi
-
 ## helper functions ##
 
 # checks status if ido2db daemon
@@ -192,7 +186,7 @@ case "$1" in
 		# start ido2db daemon
 		$Ido2dbBin -c $Ido2dbCfgFile
 		bin_exit=$?
-		touch $Ido2dbLockDir/$Ido2dbLockFile
+		if [ -d $Ido2dbLockDir ]; then touch $Ido2dbLockDir/$Ido2dbLockFile; fi
 		echo " done."
 		exit $bin_exit
 		;;