chiark / gitweb /
init script fixes
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 10 Apr 2017 00:44:46 +0000 (01:44 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 10 Apr 2017 00:44:46 +0000 (01:44 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
debian/hippotat.hippotatd.init

index fbee31f..c8b3dc2 100644 (file)
@@ -19,7 +19,7 @@ CHECK_FIREWALL=true
 # HIPPOTATD_ARGS
 AS_USER=as_user_userv
 DESCRIPTION='Asinine IP over HTTP server'
-if type -p authbind >/dev/null 2>&1; then AUTHBIND=authbind; fi
+if type authbind >/dev/null 2>&1; then AUTHBIND=authbind; fi
 
 test -e /etc/default/hippotatd &&
 . /etc/default/hippotatd
@@ -71,7 +71,8 @@ check_firewall () {
 do_start () {
        check_firewall
        ensure_dirs
-       ssd     --chuid $USER --start --startas                 \
+       ssd     --chuid $USER --start                           \
+               --startas /bin/sh -- -ec '"$@"' x               \
                $AUTHBIND $DAEMON --daemon --pidfile=$PIDFILE   \
                --syslog-facility=$LOGFACILITY $HIPPOTATD_ARGS
 }
@@ -84,12 +85,14 @@ start)
        log_daemon_msg "Starting $DESCRIPTION" hippotatd
        do_start
        log_end_msg $rc
+       exit $rc
        ;;
 
 stop)
        log_daemon_msg "Stopping $DESCRIPTION" hippotatd
        do_stop
        log_end_msg $rc
+       exit $rc
        ;;
 
 restart|force-reload)