cleanups

Signed-off-by: Andres Salomon <dilinger@debian.org>

diff --git a/autox b/autox
index 014bdc20760de9dd5df28d875c8ef6a37e72557b..02dcbabdc826f9fab7920ff03d68c38c63e8f815 100755 (executable)
--- a/autox
+++ b/autox
@@ -3,11 +3,8 @@
 TIMEOUT=20
 PIDFILE=/var/run/autox.pid
 
-#moo() {
-
 echo $$ > $PIDFILE
 trap "rm -f $PIDFILE; killall -9 startx" 0
-#trap "killall startx" 0
 fails=0
   
 while true; do
@@ -27,10 +24,5 @@ while true; do
                exit 1
        fi
 done
-#}
-
-
-#input_dev=$(readlink -f /dev/stdin)
-#autox_daemon "$input_device" &
 
 exit 0

diff --git a/debian/autox.init b/debian/autox.init
index b907ff372b0ee1bdaba35cebc606a9a362097b25..abe83a039b77393454dfa4c3c235dbc5691d80d6 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> 
@@ -41,7 +41,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
 
        #start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS &
        log_end_msg $?