* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat/files/6: tomcat.init.3 tomcat.init.2
@ 2011-04-05 17:36 Jean-Noel Rivasseau (elvanor)
0 siblings, 0 replies; 2+ messages in thread
From: Jean-Noel Rivasseau (elvanor) @ 2011-04-05 17:36 UTC (permalink / raw
To: gentoo-commits
elvanor 11/04/05 17:36:16
Modified: tomcat.init.3 tomcat.init.2
Log:
Improvement in init script, bug #191611
(Portage version: 2.1.9.42/cvs/Linux i686)
Revision Changes Path
1.2 www-servers/tomcat/files/6/tomcat.init.3
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3?r1=1.1&r2=1.2
Index: tomcat.init.3
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat.init.3 14 Feb 2011 23:09:40 -0000 1.1
+++ tomcat.init.3 5 Apr 2011 17:36:16 -0000 1.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3,v 1.1 2011/02/14 23:09:40 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3,v 1.2 2011/04/05 17:36:16 elvanor Exp $
opts="${opts} forcestop"
@@ -59,9 +59,8 @@
--stderr ${CATALINA_BASE}/logs/catalina.out"
start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
else
- start-stop-daemon ${args} --name ${exec} --startas /bin/bash -- -c \
- "exec ${exec} ${OPTS_CP} $@ ${CATALINA_ARGS} ${TOMCAT_START} >> \
- \"$CATALINA_BASE/logs/catalina.out\" 2>&1"
+ start-stop-daemon ${args} --name ${exec} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> \
+ "${CATALINA_BASE}/logs/catalina.out" 2>&1
fi
return $?
}
1.2 www-servers/tomcat/files/6/tomcat.init.2
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2?r1=1.1&r2=1.2
Index: tomcat.init.2
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat.init.2 6 Jun 2010 12:32:34 -0000 1.1
+++ tomcat.init.2 5 Apr 2011 17:36:16 -0000 1.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2,v 1.1 2010/06/06 12:32:34 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2,v 1.2 2011/04/05 17:36:16 elvanor Exp $
opts="${opts} forcestop"
@@ -59,9 +59,8 @@
--stderr ${CATALINA_BASE}/logs/catalina.out"
start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
else
- start-stop-daemon ${args} --startas /bin/bash -- -c \
- "exec ${exec} ${OPTS_CP} $@ ${CATALINA_ARGS} ${TOMCAT_START} >> \
- \"$CATALINA_BASE/logs/catalina.out\" 2>&1"
+ start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> \
+ "${CATALINA_BASE}/logs/catalina.out" 2>&1
fi
return $?
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat/files/6: tomcat.init.3 tomcat.init.2
@ 2011-04-08 11:25 Jean-Noel Rivasseau (elvanor)
0 siblings, 0 replies; 2+ messages in thread
From: Jean-Noel Rivasseau (elvanor) @ 2011-04-08 11:25 UTC (permalink / raw
To: gentoo-commits
elvanor 11/04/08 11:25:06
Modified: tomcat.init.3 tomcat.init.2
Log:
Fixed init scripts again.
(Portage version: 2.1.9.42/cvs/Linux i686)
Revision Changes Path
1.3 www-servers/tomcat/files/6/tomcat.init.3
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3?r1=1.2&r2=1.3
Index: tomcat.init.3
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat.init.3 5 Apr 2011 17:36:16 -0000 1.2
+++ tomcat.init.3 8 Apr 2011 11:25:06 -0000 1.3
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3,v 1.2 2011/04/05 17:36:16 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3,v 1.3 2011/04/08 11:25:06 elvanor Exp $
opts="${opts} forcestop"
@@ -47,20 +47,20 @@
ssd() {
local exec=${1}
shift
- local args="--start --quiet --background \
+ local args="--start --quiet \
--chdir "${CATALINA_TMPDIR}" \
--chuid ${CATALINA_USER}:${CATALINA_GROUP} \
--make-pidfile --pidfile /var/run/tomcat-6.pid"
# bug #243348
if [ -e /etc/init.d/sysfs ] ; then
- args="${args} \
+ args="${args} --background \
--stdout ${CATALINA_BASE}/logs/catalina.out \
--stderr ${CATALINA_BASE}/logs/catalina.out"
start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
else
start-stop-daemon ${args} --name ${exec} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> \
- "${CATALINA_BASE}/logs/catalina.out" 2>&1
+ "${CATALINA_BASE}/logs/catalina.out" 2>&1 &
fi
return $?
}
1.3 www-servers/tomcat/files/6/tomcat.init.2
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2?r1=1.2&r2=1.3
Index: tomcat.init.2
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat.init.2 5 Apr 2011 17:36:16 -0000 1.2
+++ tomcat.init.2 8 Apr 2011 11:25:06 -0000 1.3
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2,v 1.2 2011/04/05 17:36:16 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2,v 1.3 2011/04/08 11:25:06 elvanor Exp $
opts="${opts} forcestop"
@@ -47,20 +47,20 @@
ssd() {
local exec=${1}
shift
- local args="--start --quiet --background \
+ local args="--start --quiet \
--chdir "${CATALINA_TMPDIR}" \
--chuid ${CATALINA_USER}:${CATALINA_GROUP} \
--make-pidfile --pidfile /var/run/tomcat-6.pid"
# bug #243348
if [ -e /etc/init.d/sysfs ] ; then
- args="${args} \
+ args="${args} --background \
--stdout ${CATALINA_BASE}/logs/catalina.out \
--stderr ${CATALINA_BASE}/logs/catalina.out"
start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
else
start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> \
- "${CATALINA_BASE}/logs/catalina.out" 2>&1
+ "${CATALINA_BASE}/logs/catalina.out" 2>&1 &
fi
return $?
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-08 11:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-05 17:36 [gentoo-commits] gentoo-x86 commit in www-servers/tomcat/files/6: tomcat.init.3 tomcat.init.2 Jean-Noel Rivasseau (elvanor)
-- strict thread matches above, loose matches on Subject: below --
2011-04-08 11:25 Jean-Noel Rivasseau (elvanor)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox