SOURCES: rc-scripts-initng.patch - call rc-scripts if additional a...

[glen]

Author: glen                         Date: Wed Mar 22 11:16:03 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- call rc-scripts if additional args are passed which initng can't handle

---- Files affected:
SOURCES:
   rc-scripts-initng.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/rc-scripts-initng.patch
diff -u SOURCES/rc-scripts-initng.patch:1.2 SOURCES/rc-scripts-initng.patch:1.3
--- SOURCES/rc-scripts-initng.patch:1.2	Thu Mar 16 13:47:54 2006
+++ SOURCES/rc-scripts-initng.patch	Wed Mar 22 12:15:58 2006
@@ -1,5 +1,5 @@
 --- service	2006-02-10 21:27:45.000000000 +0200
-+++ /sbin/service	2006-03-15 23:44:59.113031891 +0200
++++ /sbin/service	2006-03-22 13:14:19.681409346 +0200
 @@ -9,11 +9,13 @@
  [ service_name [ command | --full-restart ] ]"
  
@@ -17,11 +17,12 @@
  fi
  
  if [ $# -eq 0 ]; then
-@@ -65,6 +67,41 @@
+@@ -65,6 +67,43 @@
  	esac
  done
  
 +if [ -n "$INITNG" ]; then
++	set -x
 +	if [ ! -f "${SERVICEDIR}/${SERVICE}.i" ]; then
 +		echo "${SERVICE}: unrecognized service" >&2
 +		exit 1
@@ -30,6 +31,7 @@
 +	OPT=
 +	CMD="${OPTIONS# *}"
 +	CMD="${CMD% *}"
++	ARGS="${OPTIONS# $CMD }"
 +	case "${CMD}" in
 +	start)
 +		OPT=-u
@@ -46,7 +48,7 @@
 +		;;
 +	esac
 +
-+	if [ -n "$OPT" ]; then
++	if [ -n "$OPT" -a -z "$ARGS" ]; then
 +		exec /sbin/ngc $OPT "daemon/${SERVICE}"
 +		echo "${SERVICE}: ngc execute failed" >&2
 +		exit 1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rc-scripts-initng.patch?r1=1.2&r2=1.3&f=u