[OpenWrt-Devel] [PATCH/resend] [netifd/scripts] make netifd scripts recognize signal strings such as INT/TERM/KILL/... signal in proto_kill_command()

Bastian Bittorf bittorf at bluebottle.com
Thu Oct 23 05:27:28 EDT 2014


netifd: scripts: make netifd scripts recognize signal strings such as INT/TERM/KILL/...

instead of let the caller do the conversion of symbolic to numeric (e.g. SIGUSR1 -> 16),
do the conversion internally - the old mode (numeric) is still supported

Signed-off-by: Bastian Bittorf <bittorf at bluebottle.com>
---
 scripts/netifd-proto.sh |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/netifd-proto.sh b/scripts/netifd-proto.sh
index ce316c4..6625053 100644
--- a/scripts/netifd-proto.sh
+++ b/scripts/netifd-proto.sh
@@ -286,11 +286,22 @@ proto_run_command() {
 }
 
 proto_kill_command() {
-	local interface="$1"; shift
+	local interface="$1"
+	local signal="$2"
 
 	json_init
 	json_add_int action 2
-	[ -n "$1" ] && json_add_int signal "$1"
+
+	case "$signal" in
+		[0-9]|[0-9][0-9])
+			json_add_int signal "$signal"
+		;;
+		[a-zA-Z]*)
+			signal="$( kill -l "$signal" )"
+			json_add_int signal "$signal"
+		;;
+	esac
+
 	_proto_notify "$interface"
 }
 
-- 
1.7.10.4
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list