From 77d970fd5a08a04cb2af8cba4693ddd8246b2fc1 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Tue, 17 Apr 2012 12:33:30 +0000
Subject: [PATCH] debian: initscript: reorder, change some exit statuses

---
 debian/i2p.init | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/i2p.init b/debian/i2p.init
index b61857b139..b7f3d3fa17 100755
--- a/debian/i2p.init
+++ b/debian/i2p.init
@@ -43,6 +43,10 @@ I2P_ARGS="/etc/i2p/wrapper.config \
  wrapper.java.pidfile=$JVMPIDFILE \
  wrapper.daemonize=TRUE"
 
+[ -r /lib/lsb/init-functions ] && . /lib/lsb/init-functions
+[ -r /lib/init/vars.sh ] && . /lib/init/vars.sh
+
+
 for ENV_FILE in /etc/environment /etc/default/locale; do
 [ -r "$ENV_FILE" ] || continue
 [ -s "$ENV_FILE" ] || continue
@@ -57,12 +61,6 @@ for ENV_FILE in /etc/environment /etc/default/locale; do
  done
 done
 
-# this isn't really needed since we depend on lsb-base (>= 3.2-14)
-## Actually, we *do* need this since the versioned dependency has been dropped
-## the I2P packages can be installed in GnewSense.
-[ -r /lib/lsb/init-functions ] && . /lib/lsb/init-functions
-[ -r /lib/init/vars.sh ] && . /lib/init/vars.sh
-
 # read config file
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
@@ -79,11 +77,11 @@ case "$RUN_DAEMON" in
 esac
 
 # We need the wrapper. If it's not found, abort.
-[ -x $DAEMON ] || exit 0
+[ -x $DAEMON ] || exit 1
 
 # Even though this script doesn't call it, check for i2prouter.  If it's not
 # found, it probably means that the package isn't installed anymore.
-[ -x /usr/bin/i2prouter ] || exit 0
+[ -x /usr/bin/i2prouter ] || exit 1
 
 do_start()
 {