From patchwork Mon Apr 16 02:29:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 898424 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 40PXRW6DD9z9s08 for ; Mon, 16 Apr 2018 12:30:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ACDB5876A0; Mon, 16 Apr 2018 02:30:29 +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 vbhZe70yACQa; Mon, 16 Apr 2018 02:30:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 91F8F8761B; Mon, 16 Apr 2018 02:30:28 +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 C8CB41C09A7 for ; Mon, 16 Apr 2018 02:30:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C47938768A for ; Mon, 16 Apr 2018 02:30:14 +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 q+X3ZZQRB75t for ; Mon, 16 Apr 2018 02:30:13 +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 3A9B287296 for ; Mon, 16 Apr 2018 02:30:13 +0000 (UTC) Received: from mail.datacom.ind.br (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTPS id E00D61BA0374; Sun, 15 Apr 2018 23:30:11 -0300 (-03) Received: from localhost (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTP id D391E1BA013A; Sun, 15 Apr 2018 23:30:11 -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 TYcbpAd4D9l0; Sun, 15 Apr 2018 23:30:11 -0300 (-03) Received: from p7-1130br.casantos.org (unknown [177.18.78.240]) by mail.datacom.ind.br (Postfix) with ESMTPSA id 009551BA036A; Sun, 15 Apr 2018 23:30:10 -0300 (-03) From: Carlos Santos To: buildroot@buildroot.org Date: Sun, 15 Apr 2018 23:29:35 -0300 Message-Id: <20180416022944.13644-18-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 17/26] openvpn: 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/openvpn/S60openvpn | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index de82a5095e..bc1ab01c1a 100755 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -7,13 +7,11 @@ test $DEBIAN_SCRIPT_DEBUG && set -v -x -DAEMON=/usr/sbin/openvpn CONFIG_DIR=/etc/openvpn -test -x $DAEMON || exit 0 test -d $CONFIG_DIR || exit 0 start_vpn () { - $DAEMON --daemon --writepid /var/run/openvpn.$NAME.pid \ + /usr/sbin/openvpn --daemon --writepid /var/run/openvpn.$NAME.pid \ --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || printf " FAILED->" printf " $NAME" } @@ -79,8 +77,6 @@ reload|force-reload) printf "(restarted)" else kill -HUP `cat $PIDFILE` || true -# start-stop-daemon --stop --signal HUP --quiet --oknodo \ -# --exec $DAEMON --pidfile $PIDFILE printf " $NAME" fi done