From patchwork Mon Sep 26 05:59:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 674965 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sjCwr0yxQz9ryZ for ; Mon, 26 Sep 2016 15:59:54 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=TiYjP01n; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id A3413B92810; Mon, 26 Sep 2016 07:59:47 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Mon, 26 Sep 2016 07:59:47 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8C4AFB92810 for ; Mon, 26 Sep 2016 07:59:45 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-lf0-f67.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -7 Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 26 Sep 2016 07:59:42 +0200 (CEST) Received: by mail-lf0-f67.google.com with SMTP id l131so8982147lfl.0 for ; Sun, 25 Sep 2016 22:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TrDpWTY/5w+EtlKVt+a/q6JhwIwNIyuZ2kGA+PYAK4M=; b=TiYjP01nyOriVEBOMx6IhdinqJGlLuq8SKU4lvZvSd43edQszU21/wQhSAmzu/vMge DNamW5J1M7mX6zChDIBgx50+IuhGTuc61zYoteySbZaxLoF7shtRTrZMxfpMYHnZ9sg+ f7PQ1KEr8RdGTZZhGZPsrc3RTvMXnC2Uw/iHXHiqZjTcYzIB0EoSQn90lsgUH00gmfQA kD5dtRSAlKUBonZvAshnkRaKB1KRU3Sriqu4RHHOSV/gZLhFjW9N2KmCRqugfso6ZicL w1/M4lGVyOpyUgPLKnMDik1aSJsp7O7uZmH7jjLFATVaiplz+quLDx7MX44uRpKkPfwu 7cRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TrDpWTY/5w+EtlKVt+a/q6JhwIwNIyuZ2kGA+PYAK4M=; b=C3EUyh/TolYRvhrjpThfiZgbO5wPfXiH/VmM7c4+8xz213JO2vnch44FBClRAm++SH cLqHHcT/cDAOn0obh2BXAZSMg5RIHrestaqvpWkiCM1UT7p6WRzKOn2cf1cGhB3e9ZIQ BP8dxEyZiHHEhDpcbP5A5RFczBg/ZtZHl+HBGz19RqUCwJLFXk3aubRlNpeM939Ahmgy quKvZdJO2VShZBUilHJtDfhoqm1l0XuXb8Qsy8H5HWDEMxG9KuHvMJaPRgPtMgoZxHnW prUX+g0TjbI7vcc9+CnZW1AdqPblyqfBSf2sa2l2GctSkMBaQ6pwMUHV2dKXL2XcdrcM 6foA== X-Gm-Message-State: AE9vXwN7y1zNxcxQjWf4IrKCR06WyuYapgLdYo987MYZu93kC5NkgXLm6hYh7G4dcttF4Q== X-Received: by 10.25.43.149 with SMTP id r143mr6975102lfr.22.1474869581608; Sun, 25 Sep 2016 22:59:41 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id x199sm3416085lfd.38.2016.09.25.22.59.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Sep 2016 22:59:40 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: openwrt-devel@lists.openwrt.org, lede-dev@lists.infradead.org, Luka Perkov Date: Mon, 26 Sep 2016 07:59:30 +0200 Message-Id: <20160926055930.28292-1-zajec5@gmail.com> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 Subject: [OpenWrt-Devel] [PATCH packages] pptpd: run service in foreground for procd compatibility X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Mislav Novakovic Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" From: Rafał Miłecki To have service working nicely with procd it should be running in the foreground. Otherwise it's not possible to e.g. stop it with the init.d script. Luckily for us pptpd has a simple switch that allows it. Signed-off-by: Rafał Miłecki Fixes: 15e7f611afb ("pptpd: convert init script to procd") Acked-by: Luka Perkov --- Hi Luka, This pptpd package with broken procd compatibility has been also backported to the for-15.05 branch. Can you apply this fix to for-15.05 as well, please? --- net/pptpd/files/pptpd.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/pptpd/files/pptpd.init b/net/pptpd/files/pptpd.init index 0d18aa1..294b00f 100644 --- a/net/pptpd/files/pptpd.init +++ b/net/pptpd/files/pptpd.init @@ -67,6 +67,6 @@ start_service() { ln -sfn $CHAP_SECRETS /etc/ppp/chap-secrets procd_open_instance - procd_set_param command $BIN -c $CONFIG -o $OPTIONS_PPTP + procd_set_param command $BIN -c $CONFIG --fg -o $OPTIONS_PPTP procd_close_instance }