瀏覽代碼

triggerhappy: don't test if the binary exists in the init script

The test doesn't make sense. It just exits without any error if the
binary doesn't exist, which is silly.

Replace the DAEMON variable, which was used only once, by the full path
of the binary file.

Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Carlos Santos 7 年之前
父節點
當前提交
150327e7fc
共有 1 個文件被更改,包括 1 次插入5 次删除
  1. 1 5
      package/triggerhappy/S10triggerhappy

+ 1 - 5
package/triggerhappy/S10triggerhappy

@@ -1,18 +1,14 @@
 #!/bin/sh
 
 NAME=thd
-DAEMON=/usr/sbin/$NAME
 PIDFILE=/var/run/$NAME.pid
 DAEMON_ARGS="--daemon --triggers /etc/triggerhappy/triggers.d --socket /var/run/thd.socket --pidfile $PIDFILE --user nobody /dev/input/event*"
 
-# Sanity checks
-test -x $DAEMON || exit 0
-
 [ -r /etc/default/triggerhappy ] && . /etc/default/triggerhappy
 
 start() {
         printf "Starting $NAME: "
-        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \
+        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec /usr/sbin/thd -- $DAEMON_ARGS \
                 && echo "OK" || echo "FAIL"
 }