From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5DB5A1396D0 for ; Fri, 15 Sep 2017 18:31:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B04731FC074; Fri, 15 Sep 2017 18:31:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E7971FC074 for ; Fri, 15 Sep 2017 18:31:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E8F033BEAE for ; Fri, 15 Sep 2017 18:31:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 229E09080 for ; Fri, 15 Sep 2017 18:31:42 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1505500095.50608b54ed98acb54fec5fe3323909ea684d3af9.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/rc-cgroup.sh.in X-VCS-Directories: sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 50608b54ed98acb54fec5fe3323909ea684d3af9 X-VCS-Branch: master Date: Fri, 15 Sep 2017 18:31:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 734cca0a-4ec3-470b-a3f7-615c71d4010e X-Archives-Hash: 2dfe602f4d768d681f181ad6dd6d131b commit: 50608b54ed98acb54fec5fe3323909ea684d3af9 Author: William Hubbs gmail com> AuthorDate: Fri Sep 15 18:27:49 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Sep 15 18:28:15 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=50608b54 rc-cgroup.sh: fix signal names The "SIG" prefix on signal names passed to kill -s isn't portable. sh/rc-cgroup.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sh/rc-cgroup.sh.in b/sh/rc-cgroup.sh.in index 4b713594..3c7558cd 100644 --- a/sh/rc-cgroup.sh.in +++ b/sh/rc-cgroup.sh.in @@ -204,13 +204,13 @@ cgroup_cleanup() local pids pids="$(cgroup_get_pids)" if [ -n "${pids}" ]; then - kill -s "${stopsig:-SIGTERM}" ${pids} 2> /dev/null - kill -s SIGCONT ${pids} 2> /dev/null + kill -s "${stopsig:-TERM}" ${pids} 2> /dev/null + kill -s CONT ${pids} 2> /dev/null yesno "${rc_send_sighup:-no}" && - kill -s SIGHUP ${pids} 2> /dev/null + kill -s HUP ${pids} 2> /dev/null sleep "${rc_timeout_stopsec:-90}" yesno "${rc_send_sigkill:-yes}" && - kill -s SIGKILL ${pids} 2> /dev/null + kill -s KILL ${pids} 2> /dev/null fi eend 0 }