[pkg-java] r12650 - trunk/tomcat6/debian

[Thierry Carrez]

Author: ttx-guest
Date: 2010-06-24 13:56:50 +0000 (Thu, 24 Jun 2010)
New Revision: 12650

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6.init
Log:
Force backgrounding of catalina.sh in start-stop-daemon, to allow the init
script to be started through ssh -t (LP: #588481)

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-06-24 13:17:59 UTC (rev 12649)
+++ trunk/tomcat6/debian/changelog	2010-06-24 13:56:50 UTC (rev 12650)
@@ -9,11 +9,13 @@
       patches and to Adam Guthrie for the Lucid debdiff.
   * Allow binding to any interface when using authbind, rather than only allow
     binding to all (LP: #594989)
+  * Force backgrounding of catalina.sh in start-stop-daemon, to allow the init
+    script to be started through ssh -t (LP: #588481)
 
   [ Torsten Werner ]
   * Remove Paul from Uploaders list.
 
- -- Thierry Carrez <thierry.carrez at ubuntu.com>  Thu, 24 Jun 2010 15:15:12 +0200
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Thu, 24 Jun 2010 15:55:10 +0200
 
 tomcat6 (6.0.26-3) unstable; urgency=low
 

Modified: trunk/tomcat6/debian/tomcat6.init
===================================================================
--- trunk/tomcat6/debian/tomcat6.init	2010-06-24 13:17:59 UTC (rev 12649)
+++ trunk/tomcat6/debian/tomcat6.init	2010-06-24 13:56:50 UTC (rev 12650)
@@ -149,7 +149,7 @@
 	set +e
 	touch "$CATALINA_PID" "$CATALINA_BASE"/logs/catalina.out
 	chown $TOMCAT6_USER "$CATALINA_PID" "$CATALINA_BASE"/logs/catalina.out
-	start-stop-daemon --start -u "$TOMCAT6_USER" -g "$TOMCAT6_GROUP" \
+	start-stop-daemon --start -b -u "$TOMCAT6_USER" -g "$TOMCAT6_GROUP" \
 		-c "$TOMCAT6_USER" -d "$CATALINA_TMPDIR" \
 		-x /bin/bash -- -c "$AUTHBIND_COMMAND $TOMCAT_SH"
 	status="$?"