don't let debhelper override our init script settings

[autox] / debian / autox.init

diff --git a/debian/autox.init b/debian/autox.init
index b907ff372b0ee1bdaba35cebc606a9a362097b25..a5a697f95c9f32d56bbd8eec31f072016044a7c8 100755 (executable)
--- a/debian/autox.init
+++ b/debian/autox.init
@@ -5,7 +5,7 @@
 # Required-Stop:     $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Automatically start X as a user
+# Short-Description: Automatically start X on boot
 ### END INIT INFO
 #
 # Author:            Andres Salomon <dilinger@debian.org> 
@@ -29,7 +29,8 @@ if [ -f /etc/default/$NAME ] ; then
 fi
 
 if [ -z "$AUTOX_USER" ]; then
-       log_failure_msg "No user specified in /etc/default/${NAME}."
+       log_failure_msg "No user specified in /etc/default/${NAME}"
+       exit 0
 fi
 
 case "$1" in
@@ -41,7 +42,8 @@ case "$1" in
 # -- /dev/tty7
        #start-stop-daemon --start --chuid olpc --verbose --background --make-pidfile --pidfile $PIDFILE --user olpc --exec $DAEMON -- /dev/tty7
 #start-stop-daemon --start --verbose --background --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- /dev/tty7
-start-stop-daemon --start --background --pidfile $PIDFILE --exec $DAEMON
+       start-stop-daemon --start --background --pidfile $PIDFILE \
+                       --exec $DAEMON -- $AUTOX_USER
 
        #start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS &
        log_end_msg $?