[jetty9] 22/99: Fix server startup when jsvc is not installed

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository jetty9.

commit d257a447731202cecc0921ad7b68e369d721728f
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri May 18 20:12:49 2012 +0200

    Fix server startup when jsvc is not installed
---
 debian/changelog   | 6 ++++++
 debian/jetty8.init | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ddc53e..b86d4bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jetty8 (8.1.3-2) UNRELEASED; urgency=low
+
+  * Fix server startup when jsvc is not installed.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Fri, 18 May 2012 20:11:19 +0200
+
 jetty8 (8.1.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/jetty8.init b/debian/jetty8.init
index 8ba13ca..b8483f5 100644
--- a/debian/jetty8.init
+++ b/debian/jetty8.init
@@ -69,7 +69,6 @@ JETTY_HOME=/usr/share/$NAME
 LOGDIR="/var/log/$NAME"
 START_JAR="$JETTY_HOME/start.jar"
 DEFAULT=/etc/default/$NAME
-DAEMON=/usr/bin/jsvc
 JVM_TMP=/var/cache/$NAME/tmp
 
 if [ `id -u` -ne 0 ]; then
@@ -155,8 +154,6 @@ if [ ! -r "$START_JAR" ]; then
 	exit 1
 fi
 
-[ -f "$DAEMON" ] || exit 0
-
 # Check whether startup has been disabled
 if [ "$NO_START" != "0" -a "$1" != "stop" ]; then 
 	[ "$VERBOSE" != "no" ] && log_failure_msg "Not starting jetty - edit /etc/default/jetty8 and change NO_START to be 0 (or comment it out)."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git