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

[Thierry Carrez]

Author: ttx-guest
Date: 2010-11-23 15:45:54 +0000 (Tue, 23 Nov 2010)
New Revision: 13100

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6.init
Log:
Add missing -p option in start-stop-daemon when starting tomcat6 to avoid
failing to start due to /bin/bash running (LP: #632554)

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-11-21 23:22:32 UTC (rev 13099)
+++ trunk/tomcat6/debian/changelog	2010-11-23 15:45:54 UTC (rev 13100)
@@ -4,6 +4,8 @@
 
   [ Thierry Carrez (ttx) ]
   * Do not fail to purge if /etc/tomcat6 was manually removed (LP: #648619)
+  * Add missing -p option in start-stop-daemon when starting tomcat6 to avoid
+    failing to start due to /bin/bash running (LP: #632554)
 
   [ tony mancill ]
   * Use debconf to determine tomcat6 user and group to delete upon purge.
@@ -11,7 +13,7 @@
   * Add tomcat-native to Suggests: for tomcat6 binary pacakge. 
     Thanks to Eddy Petrisor  (Closes: #600590)
 
- -- tony mancill <tmancill at debian.org>  Tue, 26 Oct 2010 20:45:11 -0700
+ -- Thierry Carrez (ttx) <thierry.carrez at ubuntu.com>  Tue, 23 Nov 2010 16:39:31 +0100
 
 tomcat6 (6.0.28-7) unstable; urgency=low
 

Modified: trunk/tomcat6/debian/tomcat6.init
===================================================================
--- trunk/tomcat6/debian/tomcat6.init	2010-11-21 23:22:32 UTC (rev 13099)
+++ trunk/tomcat6/debian/tomcat6.init	2010-11-23 15:45:54 UTC (rev 13100)
@@ -150,7 +150,7 @@
 	touch "$CATALINA_PID" "$CATALINA_BASE"/logs/catalina.out
 	chown $TOMCAT6_USER "$CATALINA_PID" "$CATALINA_BASE"/logs/catalina.out
 	start-stop-daemon --start -b -u "$TOMCAT6_USER" -g "$TOMCAT6_GROUP" \
-		-c "$TOMCAT6_USER" -d "$CATALINA_TMPDIR" \
+		-c "$TOMCAT6_USER" -d "$CATALINA_TMPDIR" -p "$CATALINA_PID" \
 		-x /bin/bash -- -c "$AUTHBIND_COMMAND $TOMCAT_SH"
 	status="$?"
 	set +a -e