[pkg-jboss-commits] cvs commit to jboss3/debian by agx

[pkg-jboss-commits@lists.alioth.debian.org]

Update of /cvsroot/pkg-jboss/jboss3/debian
In directory haydn:/tmp/cvs-serv9139

Modified Files:
	jboss3.init jboss3.default 
Log Message:
ease option jboss option passing

Index: jboss3.init
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/jboss3.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jboss3.init	9 Jun 2004 08:36:06 -0000	1.5
+++ jboss3.init	18 Jun 2004 07:45:57 -0000	1.6
@@ -59,6 +59,8 @@
 
 [ -n "$JBOSS_SERVER" ] && STARTUP_OPTS="-c $JBOSS_SERVER"
 
+[ -n "$JBOSS_OPTS" ] && STARTUP_OPTS="$STARTUP_OPTS $JBOSS_OPTS"
+
 JBOSS_START="$JBOSS_HOME/bin/run.sh"
 JBOSS_STOP="$JBOSS_HOME/bin/shutdown.sh -S"
 
@@ -119,6 +121,7 @@
 				start-stop-daemon --stop --signal 9 --oknodo \
 					--quiet --pidfile "$JBOSS_PID" \
 					--user "$JBOSS_USER"
+				sleep 2
 			fi
 			echo -n "."
 		done

Index: jboss3.default
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/jboss3.default,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jboss3.default	9 Jun 2004 08:36:06 -0000	1.3
+++ jboss3.default	18 Jun 2004 07:45:57 -0000	1.4
@@ -14,6 +14,9 @@
 # Configuration layout to use
 #JBOSS_SERVER=debian
 
+# Options passed to JBoss on startup
+#JBOSS_OPTS=
+
 # Timeout in seconds for the shutdown procedure (default: 30). The Java
 # processes will be killed if tomcat4 has not stopped until then.
 #JBOSS_SHUTDOWN=30