From 57dc561f9679fa7afaee28f2d414dc20be69d66b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Wed, 5 Nov 2014 02:19:24 +0100 Subject: [PATCH 1/1] UPD: Fix the debian package --- debian/cacert-gigi-testing.cacert-gigi.init | 3 +-- debian/cacert-gigi.cacert-gigi.init | 3 +-- doc/scripts/gigi | 8 ++++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/cacert-gigi-testing.cacert-gigi.init b/debian/cacert-gigi-testing.cacert-gigi.init index 46235d43..f0730123 100644 --- a/debian/cacert-gigi-testing.cacert-gigi.init +++ b/debian/cacert-gigi-testing.cacert-gigi.init @@ -54,8 +54,7 @@ do_start() # 2 if daemon could not be started start-stop-daemon -b --start --quiet --pidfile $PIDFILE -d $DIR --exec $DAEMON --test > /dev/null \ || return 1 - start-stop-daemon -b --start --quiet --pidfile $PIDFILE --make-pidfile -d $DIR --exec $DAEMON --no-close -- \ - $DAEMON_ARGS < /etc/cacert-gigi/conf.tar >> /var/log/cacert-gigi.log 2>&1 \ + start-stop-daemon -b --start --quiet --pidfile $PIDFILE -d $DIR --exec /usr/bin/gigi -- start-daemon \ || return 2 # The above code will not work for interpreted scripts, use the next # six lines below instead (Ref: #643337, start-stop-daemon(8) ) diff --git a/debian/cacert-gigi.cacert-gigi.init b/debian/cacert-gigi.cacert-gigi.init index d31f546a..d044355f 100644 --- a/debian/cacert-gigi.cacert-gigi.init +++ b/debian/cacert-gigi.cacert-gigi.init @@ -54,8 +54,7 @@ do_start() # 2 if daemon could not be started start-stop-daemon --start --quiet --pidfile $PIDFILE -d $DIR --exec $DAEMON --test > /dev/null \ || return 1 - start-stop-daemon -b --start --quiet --pidfile $PIDFILE --make-pidfile -d $DIR --exec $DAEMON --no-close -- \ - $DAEMON_ARGS < /etc/cacert-gigi/conf.tar >> /var/log/cacert-gigi.log 2>&1 \ + start-stop-daemon -b --start --quiet --pidfile $PIDFILE -d $DIR --exec /usr/bin/gigi -- start-daemon \ || return 2 # The above code will not work for interpreted scripts, use the next # six lines below instead (Ref: #643337, start-stop-daemon(8) ) diff --git a/doc/scripts/gigi b/doc/scripts/gigi index b497e4d0..f0c09b98 100755 --- a/doc/scripts/gigi +++ b/doc/scripts/gigi @@ -13,6 +13,14 @@ cd /var/lib/cacert-gigi if [ "$1" == "start" ] then java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.Launcher +elif [ "$1" == "start-daemon" ] +then + if [ ! -e /etc/cacert-gigi/conf.tar ]; then + echo "Config missing." + exit 1; + fi + java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.Launcher < /etc/cacert-gigi/conf.tar >> /var/log/cacert-gigi.log 2>&1 & + echo $! > /var/run/cacert-gigi.pid elif [ "$1" == "signer" ] then java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.util.SimpleSigner -- 2.39.2