From 3e6e33f52831b6a874401fa779e807a451e56137 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Tue, 2 Jan 2018 14:34:51 +0000 Subject: [PATCH] procd: procd_send_signal use signal names 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 Signed-off-by: Kevin Darbyshire-Bryant (cherry picked from commit 37bb463daa21e2c97365c6543b2bfdfe673c5baa) --- package/system/procd/Makefile | 2 +- package/system/procd/files/procd.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index b905cb25aa0..d7b3e47fdbb 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 e6ca8a6bc92..36388adaed8 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -383,6 +383,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"