SOURCES: daemontools.init - skip errors when no services are regis...

glen glen at pld-linux.org
Thu Jan 5 22:42:18 CET 2006


Author: glen                         Date: Thu Jan  5 21:42:18 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- skip errors when no services are registered at shutdown

---- Files affected:
SOURCES:
   daemontools.init (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SOURCES/daemontools.init
diff -u SOURCES/daemontools.init:1.13 SOURCES/daemontools.init:1.14
--- SOURCES/daemontools.init:1.13	Thu Dec  8 02:02:49 2005
+++ SOURCES/daemontools.init	Thu Jan  5 22:42:13 2006
@@ -56,8 +56,11 @@
 	if [ -f /var/lock/subsys/svscan ]; then
 		msg_stopping svscan
 		killproc svscan
-		svc -d -x $SVSCAN_DIR/* \
-		    $(find $SVSCAN_DIR/* -maxdepth 0 -follow -perm -1000|sed s-\$-/log-)
+		svc=$(echo $SVSCAN_DIR/*)
+		if [ "$svc" != "$SVSCAN_DIR/*" ]; then
+			svc -d -x $SVSCAN_DIR/* \
+				$(find $SVSCAN_DIR/* -maxdepth 0 -follow -perm -1000|sed s-\$-/log-)
+		fi
 		rm -f /var/run/svscan.pid /var/lock/subsys/svscan >/dev/null 2>&1
 	else
 		msg_not_running svscan
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/daemontools.init?r1=1.13&r2=1.14&f=u



More information about the pld-cvs-commit mailing list