Message ID | 20180102143451.22124-1-ldir@darbyshire-bryant.me.uk |
---|---|
State | Accepted |
Headers | show
Return-Path: <lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="W9nuNzOw"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b="vgGxRu8U"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z9xS22BSlz9t3H for <incoming@patchwork.ozlabs.org>; Wed, 3 Jan 2018 01:35:22 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=1E4ocUnOqTUraeP7XrpWy6/SWHhiCYhqM8GQmOUBGvw=; b=W9nuNzOwnO1siU q46qbJpNfzg9Y5oJ5KlkthRHVnWEipJrksYJBf28eTnbl66+bN8wuAfkFsPYRTYbBTby32gCMuo4G hdjRjkDNas6vMvF6fpRwG00fmPDAxSfN4rvjWXVVziQp4d7dQ7A1pCT1nT1HtPu4JNI3HQo2Fxp9w Exri/V1xy0b57XmoLwr39bJNpVqOGX2DlChQx8uqAycJxXXdxkr8sjyshLqbEyU80bMgc4jfxQ2Ft FGHk71rdZzMvOsVouFf/1Q1cYZCEIenaQG45K2doGRVjX2gcY/rfhk+JeEJAB7Pcvqu2NcNsuVpvE KBR/TdkbuBIBi+t/M30Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eWNet-0001VR-BJ; Tue, 02 Jan 2018 14:35:15 +0000 Received: from mail-eopbgr50061.outbound.protection.outlook.com ([40.107.5.61] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eWNep-0000Ck-KY for lede-dev@lists.infradead.org; Tue, 02 Jan 2018 14:35:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=PcsGHbZN9lQuUNBTAVSoxXDMpN0WnmziUM4Wb1RadTU=; b=vgGxRu8UjekdwF87mDEmGaH0CwwO6AvDz+HYDHzGvJnkJMcCE31kxKnoXDKRHeaXjVDtUA34duEV5V2FtA8JJUL9ihy1yoftxRnAfqrjPQvwAWKouqiiAjqUZG6lvyFiNVDZqUdJ+Vr5M8KhEWZJV7oI846QN39YJHuIgGNLZIM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from Rowlf.darbyshire-bryant.me.uk (151.227.238.51) by AM0PR0702MB3730.eurprd07.prod.outlook.com (2603:10a6:208:26::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.4; Tue, 2 Jan 2018 14:34:58 +0000 From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> To: lede-dev@lists.infradead.org Date: Tue, 2 Jan 2018 14:34:51 +0000 Message-Id: <20180102143451.22124-1-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.14.3 (Apple Git-98) MIME-Version: 1.0 X-Originating-IP: [151.227.238.51] X-ClientProxiedBy: HE1PR0701CA0074.eurprd07.prod.outlook.com (2603:10a6:3:64::18) To AM0PR0702MB3730.eurprd07.prod.outlook.com (2603:10a6:208:26::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a6c82cf-9130-4c67-f2fd-08d551edffe9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4603075)(4627115)(201702281549075)(5600026)(4604075)(2017052603307)(7153060); SRVR:AM0PR0702MB3730; X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3730; 3:ZCqUBGYDsmzeG6EIubDznuUbfm0+N0bBiJIkeeBneU1//pS5C9LUB06JhI59lkSFwNSOuBOl9F6nyA1kuQHB3YmoEsmx02O65Vj4bOwJVOehPeaAE+nyooVd0Wo+sAYWKNfXrNWCk++4Y9qPehmhkjVDm7XcKn2dP4b6G5Y+40YZZmwOGXQ3TfkPuTOjxDXyK0ejYXpzM3TB0HqOScY0ig44yqt5b5ln9mVl1TGD7rc0zUoFbHF4heP4cpaozSe4; 25:LV/6xfqiXNbKLtpa42vB1UiEj2vwvVyEXsQ8ycAoRKYZ8fZ40ylPJMJmyzafWNy7G7Nqg6PhNmKwvo7z6vEmZiZTOAvinVZzasZkjUxkapnl8XBIAuQd8yw2QoCVdsZqn6U6GZ2vwrklhCzPvvKWRKHyw4dHTR6zSHLCW48LQRbraNMITEzBtf+5+QcHdpwuNXXudcUB/UGGcVktgjN2KVD+1Uic1GT7zyW1lTYgmf08DSrgOjtt5WO3h5iA3x607PfaH6m2UMRNFvDxB3bA1vW3OIa8r5545X0QNi7lg2jT8M6KOXVEZ8veF2QqvBCMtbWPZLt3Ki/Cxg3ZYZXdXA==; 31:MTh/UzxsqDGxzaps7W3QqquiArjHFYQPG8eID5/FbE8Vz6bAoxWWfZ9NiefyDd9qB1M5l/unbwi5/Ntd8ytfRNxiK0vczJoTykZrx8FEtv7mnlylVEdxgj/Qocu3KO8uR2IPw5w88OKOmx6SLbwJ0uiI/qaN9cikvpcBcXLBSBYiepZdlJfZSoKpGkvn/+LLW1EheZRdRyhZImb1z+xgfea+0ydZk+LE2BtqOcJ4SW4= X-MS-TrafficTypeDiagnostic: AM0PR0702MB3730: X-Microsoft-Antispam-PRVS: <AM0PR0702MB37307227B135B8DD9F059C15A5190@AM0PR0702MB3730.eurprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3002001)(3231023)(944501075)(10201501046)(93006095)(93001095)(6041268)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(2016111802025)(20161123560045)(20161123564045)(6072148)(6043046)(201708071742011); SRVR:AM0PR0702MB3730; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM0PR0702MB3730; X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3730; 4:sXIkA9npiPy1oOwit+t2E8ec/bw3Nya+6+MgPCEjZFVGO5bvd4YNOFTusw4soFFlmlpQgaZYTxUAV7s7gts9slHzNfpoezNK1U9AY2j5TMlqaq3dQoV7a3jC9r76aX03a+DhmAQr63+42dZwnUKZS40JraQXHuxnTHhMK9GT3c87imzi2bEeQgBL5LU5teuVCelVXRM4GC7kM0dupMvWBB2CLLzgAa1gXghP8A+hnMNVXvM01kobM8p+O2Hqq+fdu8DiwXSeqD60gtRdJV63Tg== X-Forefront-PRVS: 0540846A1D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39830400003)(346002)(39380400002)(366004)(376002)(189003)(199004)(59450400001)(966005)(2906002)(2361001)(8936002)(50226002)(386003)(4326008)(107886003)(53416004)(69596002)(106356001)(2351001)(5660300001)(6486002)(68736007)(97736004)(74482002)(81156014)(8676002)(6666003)(51416003)(52116002)(7696005)(42882006)(25786009)(6116002)(3846002)(81166006)(6916009)(1076002)(47776003)(7736002)(48376002)(36756003)(53936002)(50466002)(478600001)(105586002)(16586007)(16526018)(6306002)(316002)(305945005)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0702MB3730; H:Rowlf.darbyshire-bryant.me.uk; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR0702MB3730; 23:C/+HLvFh7zz9KWU1LUKH8eGe1JR3UNqa1Ny9hDa?= hmOVhwjU+fpRAaM9mDDVpciMHTv9mL7g7q0UIt7JNEx0EwZ3seR+EmqKf4pKll5vEtHXxolCJSmxMSQu8D8taa6AF5r++3YcRH4rs5DcN0EMvcSrz+Hw2HaTlwaZkWXjE0QZtMKi1GsleQPGOSqO1uBKCw3s9om3fjoOWJHBIJFBHyT8dpsbf9lkMy0t5C3ZjRxNwclG8z0oJGKRf+MoeFs5EdSgUrXn6Y1G2emGZ5CWZ1R/dO4LLVwO7JGVccPVMH2U3LjXmoyoOT0ztNR3SO5wgMObSjP5Q3YVcojOKGK6eXf7/OyzdIAcDpbgZog5AjGjaPTk+H0vAx6isRUoMO8Wh+dQ56jUMCHMoZSSsUIMQKCpnN8LP99yVR4evxI7LTDq1GwXGyp/9J7n+m/VUYj526v1TOEnm8MhHfLOYXvfhpdxJT68XfMsMGucqks9m9LAWU2+MM9cUadppJ+J0W4We8WceilaNjYCN1OLVOojvTARvCXrEgdBaIplR+AhFoozcinJnDNOifcYiL9MdNa0vMTp4DfcLGExylEkuvW2H47OgAnWcp9VmVBQr0hbBSjxtPq3wyxvzBIhQXc+qAzaaPAcWtn+9xYNnZp225qV6SE5176nQoGS/aesqbSo6Za3lQQv3m/EILjjZZBCvNkVZq4BPMAW0sdqaKqxoia4j0iVBC9FYtQGXQ6Tm372/vg217AoLlBwYqlA0x5hw2yLPnEolY2lBJGtxjoZZzUrLkJ2xxfsboVkwB7swueun8Ci251mXuOd+XVNTFKs9Z6cPjNbj/13zaHpjCMKkDWMBB7Dk9a44JkIQisaokLU6kNb1ejvUu6WcrUCx5zasvj9LlbYR+1wT+cX0T7oqh5yDgpb6mVIZrXSQv+WgegltvNUKxd/26vOqtezF3LMRsKDDxKL32bS/stU8DujL1oJY7k+XDiZbkayzuF2kkuiXz56unLgZjIG8eDhgftdgpTCf8ST3Hywce7ITYrnOITu93M9w0PANKSMJ2ug4QZE9y6NJtR+WxpLEht1CeKQYs0yZhEuGa+yvzFprF6snMtmlAi8TSSpI1KzCZbiM0/bWwf+gbCkG55tLoUSE/DpWRWra7xcP28gLCnMBjXa8EXLExGHMf5FnV/cBm/pyaf+B1KDjxR9mxg8dgWP5gVYFbdx2 X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3730; 6:KwzGJdn3YZ6EdYlMkFKDkGcnwPHBel66XBraaNx0b4oTbn7qw3MBf73hNoxynz1Nyfi0aiGtEDKzOhmkUHZgFu1meLZq4ZVxrwuQpUZrb3st/6Bm2XssIadnEuxiRHM0w3gFQnbnWMdyH5bFR8mn9d7foN7Z0dxFbvMN1XH4HnaV6IXNZBpwJnsZv1yYM9rAiUldsxy+qj7cEO5+q8+MPHa66mW6peLrdr+VZeY6xpIKHuXlXFHfZlnJHm15UiHFsYqZ4B1i6iRCM1Uo9jZimdihT1CcBYSpYkf5uP+JlMc+jvSBh5xGJ4/Y+sCsKrRb94svafohahZzFoy52i3Jeu/txVZbFQnFaTc35DDAAtQ=; 5:y90+9qLvFDrsxDvw0eHbGb2511PTRNIFgadd4vnZj2r5RWsft0zLWvDZ9w6CXXUd5hOOqhFcfsFkqW+OwfvLyx5lfvjyB7ohg/+vmbg+SncscE6uGxHBaTvgVrtpye8kOBDDMYmbGPCwlfJfGs3GdBVrtsM4coQodm4gWNppbhM=; 24:6c0nuLo3egdLqTOCQJWtxT7ro20xf//3marbLQojENXHIi75g6qbVomRkjX4E+0k72N1chYCX/u6jc/LK1gQ24YokxLSVOMFaIDJQzgsgiY=; 7:TlfHNx8u9Mvg3ROG1ftuTVFKktStD/dgwn+UWtoVHwMezdYIHnlzphhjTu5VGMDuqX15QzwvliX9wDX059pw9T8u8XGGIjZ6c0tJuLXMOQ5bNt+doIuwaJfmMLGozSgkTBgB2GeXmzC1PGsqEoRKAUGc8ZAwyLqz/kIlC5vI8CbxAk+ate+IWSXxDL28RjUV9kEK00ivra9TXU38Hl9REP7B0zQUIQqt+lUtC//TE8xxqnLoK0c3JOODfo4l1hDN SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jan 2018 14:34:58.1664 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a6c82cf-9130-4c67-f2fd-08d551edffe9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0702MB3730 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180102_063511_940953_1BD0344A X-CRM114-Status: UNSURE ( 5.67 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [40.107.5.61 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [40.107.5.61 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Subject: [LEDE-DEV] [PATCH v1] procd: procd_send_signal use signal names X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <lede-dev.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/lede-dev>, <mailto:lede-dev-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/lede-dev/> List-Post: <mailto:lede-dev@lists.infradead.org> List-Help: <mailto:lede-dev-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/lede-dev>, <mailto:lede-dev-request@lists.infradead.org?subject=subscribe> Cc: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Lede-dev" <lede-dev-bounces@lists.infradead.org> Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
[LEDE-DEV,v1] procd: procd_send_signal use signal names
|
expand
|
Merged into my staging tree with http://git.lede-project.org/?p=lede/jow/staging.git;a=commitdiff;h=df5303c92a. Thank you!
diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index bffed81c90..7c8a1669b0 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index b8d3513b1e..7b3213a488 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -413,6 +413,10 @@ _procd_send_signal() { local instance="$2" local signal="$3" + case "$signal" in + [A-Z]*) signal="$(kill -l "$signal" 2>/dev/null)" || return 1 ;; + esac + json_init json_add_string name "$service" [ -n "$instance" -a "$instance" != "*" ] && json_add_string instance "$instance"
Usage documentation for 'procd_send_signal' states "The signal is SIGHUP by default, and must be specified by NAME." Make actual behaviour match the stated documented behaviour. https://wiki.openwrt.org/inbox/procd-init-scripts Suggested-by: Jo-Philip Wich <jow@mein.io> Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> --- package/system/procd/Makefile | 2 +- package/system/procd/files/procd.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)