[Devil-linux-commit] build/scripts/scripts named,1.9,1.9.2.1

[<fr...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv2349

Modified Files:
      Tag: rel-1-0-patches
	named 
Log Message:
Dear Heiko, our jailer, wants to keep everybody in jail, even if they
do not want to.


Index: named
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/named,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- named	20 Aug 2003 19:15:35 -0000	1.9
+++ named	9 Jan 2004 02:28:59 -0000	1.9.2.1
@@ -24,7 +24,7 @@
 CONFIGNAME=NAMED
 DAEMON=/usr/sbin/named
 PACKAGE_NAME=ISC_BIND
-PARAMETER="-u named -t $JAIL_DIR/$PACKAGE_NAME -c /etc/named.conf"
+PARAMETER="-u named -c /etc/named.conf"
 
 # source function library
 source /etc/init.d/functions
@@ -40,16 +40,19 @@
 test "$START" = "yes" || exit 0
 
 case "$1" in
-  start)
+	start)
 		if [ -f /etc/sysconfig/jail/$PACKAGE_NAME ] && [ "$JAIL_ENABLE" == yes ]; then
 			/etc/init.d/jail start $PACKAGE_NAME
+			PARAMETER="${PARAMETER} -t $JAIL_DIR/$PACKAGE_NAME"
 		fi
 		echo -n "Starting $NAME: "
 		loadproc $DAEMON $PARAMETER
 		;;
 	stop)
 		echo -n "Shutting down $NAME: "
-		[ -f /etc/sysconfig/jail/$PACKAGE_NAME ] && [ "$JAIL_ENABLE" == yes ] && /etc/init.d/jail stop $PACKAGE_NAME
+		if [ -f /etc/sysconfig/jail/$PACKAGE_NAME ] && [ "$JAIL_ENABLE" == yes ]; then
+			/etc/init.d/jail stop $PACKAGE_NAME
+		fi
 		killproc $DAEMON
 		;;
 	restart)