From patchwork Mon Apr 16 02:29:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 898433 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=datacom.ind.br Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40PXRj0tNxz9s21 for ; Mon, 16 Apr 2018 12:30:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5C173876D4; Mon, 16 Apr 2018 02:30:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xx8+17OF5vVW; Mon, 16 Apr 2018 02:30:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BFCA787657; Mon, 16 Apr 2018 02:30:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1F4CC1C09A7 for ; Mon, 16 Apr 2018 02:30:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1BBB68705E for ; Mon, 16 Apr 2018 02:30:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Pmr7Q4KauIxB for ; Mon, 16 Apr 2018 02:30:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.datacom.ind.br (mx.datacom.ind.br [177.66.5.10]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8E4BC86D6F for ; Mon, 16 Apr 2018 02:30:19 +0000 (UTC) Received: from mail.datacom.ind.br (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTPS id 238BD1BA036C; Sun, 15 Apr 2018 23:30:18 -0300 (-03) Received: from localhost (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTP id 14AA31BA0348; Sun, 15 Apr 2018 23:30:18 -0300 (-03) Received: from mail.datacom.ind.br ([127.0.0.1]) by localhost (mail.datacom.ind.br [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id EoreTUNVrXkj; Sun, 15 Apr 2018 23:30:17 -0300 (-03) Received: from p7-1130br.casantos.org (unknown [177.18.78.240]) by mail.datacom.ind.br (Postfix) with ESMTPSA id 2F0511BA034C; Sun, 15 Apr 2018 23:30:17 -0300 (-03) From: Carlos Santos To: buildroot@buildroot.org Date: Sun, 15 Apr 2018 23:29:42 -0300 Message-Id: <20180416022944.13644-25-casantos@datacom.ind.br> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180416022944.13644-1-casantos@datacom.ind.br> References: <20180416022944.13644-1-casantos@datacom.ind.br> Subject: [Buildroot] [PATCH 24/26] triggerhappy: don't test if the binary exists in the init script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , John Stile , Aleksander Morgado , Simon Dawson , Eric Le Bihan , Dushara Jayasinghe , "Yann E . MORIN" MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- package/triggerhappy/S10triggerhappy | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/triggerhappy/S10triggerhappy b/package/triggerhappy/S10triggerhappy index 3253e910b1..4853873067 100755 --- a/package/triggerhappy/S10triggerhappy +++ b/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" }