From 4fd338b3a60211e8b5d5fc63b6c602ebe7e6258b Mon Sep 17 00:00:00 2001 From: Chris Lawrence Date: Mon, 3 Mar 2008 09:01:07 -0600 Subject: [PATCH] lsb 3.2-3 Debian release. --- debian/changelog | 6 ++++++ init-functions | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9779110..1422cd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lsb (3.2-3) unstable; urgency=medium + + * Handle missing $sig in killproc() properly. (Closes: #469167) + + -- Chris Lawrence Mon, 03 Mar 2008 09:01:07 -0600 + lsb (3.2-2) unstable; urgency=low * lsb_release -v now detects the lsb-qt4 version(s) installed correctly. diff --git a/init-functions b/init-functions index beb44f6..1b2d56f 100644 --- a/init-functions +++ b/init-functions @@ -119,7 +119,11 @@ killproc () { [ -n "$sig" -o "$sig" = 15 -o "$sig" = TERM ] && is_term_sig=yes status=0 if [ ! "$is_term_sig" = yes ]; then - /sbin/start-stop-daemon --stop --pidfile "$pidfile" --signal "$sig" --quiet $name_param || status="$?" + if [ -n "$sig" ]; then + /sbin/start-stop-daemon --stop --pidfile "$pidfile" --quiet $name_param || status="$?" + else + /sbin/start-stop-daemon --stop --signal "$sig" --pidfile "$pidfile" --quiet $name_param || status="$?" + fi else /sbin/start-stop-daemon --stop --pidfile "$pidfile" --retry 5 --quiet --oknodo $name_param || status="$?" fi -- 2.30.2