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 F3CB5138330 for ; Tue, 13 Sep 2016 17:54:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30875E0B03; Tue, 13 Sep 2016 17:54:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F17B8E0B03 for ; Tue, 13 Sep 2016 17:54:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADA163408A2 for ; Tue, 13 Sep 2016 17:54:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D27F32475 for ; Tue, 13 Sep 2016 17:54:04 +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: <1473789130.8a8032478a755f6e2ceaebc5425e61c6817df936.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/runit.sh sh/s6.sh sh/start-stop-daemon.sh sh/supervise-daemon.sh X-VCS-Directories: sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 8a8032478a755f6e2ceaebc5425e61c6817df936 X-VCS-Branch: master Date: Tue, 13 Sep 2016 17:54:04 +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: 1227cb46-b44e-4c4f-9605-1153cdd3ed3b X-Archives-Hash: 33a4cce8d07369e8b1ebcf437c365038 commit: 8a8032478a755f6e2ceaebc5425e61c6817df936 Author: William Hubbs gmail com> AuthorDate: Tue Sep 13 17:27:08 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Sep 13 17:52:10 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=8a803247 Make use of name vs RC_SVCNAME consistent in supervisor scripts This fixes #79. sh/runit.sh | 4 ++-- sh/s6.sh | 4 ++-- sh/start-stop-daemon.sh | 4 ++-- sh/supervise-daemon.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sh/runit.sh b/sh/runit.sh index e9c1d22..3cef0f3 100644 --- a/sh/runit.sh +++ b/sh/runit.sh @@ -21,7 +21,7 @@ runit_start() ebegin "Starting ${name:-$RC_SVCNAME}" ln -snf "${service_path}" "${service_link}" sv start "${service_link}" > /dev/null 2>&1 - eend $? "Failed to start $RC_SVCNAME" + eend $? "Failed to start ${name:-$RC_SVCNAME}" } runit_stop() @@ -36,7 +36,7 @@ runit_stop() ebegin "Stopping ${name:-$RC_SVCNAME}" sv stop "${service_link}" > /dev/null 2>&1 && rm "${service_link}" - eend $? "Failed to stop $RC_SVCNAME" + eend $? "Failed to stop ${name:-$RC_SVCNAME}" } runit_status() diff --git a/sh/s6.sh b/sh/s6.sh index 447419c..d1b9c10 100644 --- a/sh/s6.sh +++ b/sh/s6.sh @@ -30,7 +30,7 @@ s6_start() sleep 1.5 set -- $(s6-svstat "${s6_service_link}") [ "$1" = "up" ] - eend $? "Failed to start $RC_SVCNAME" + eend $? "Failed to start ${name:-$RC_SVCNAME}" } s6_stop() @@ -44,7 +44,7 @@ s6_stop() s6-svc -wD -d -T ${s6_service_timeout_stop:-10000} "${s6_service_link}" set -- $(s6-svstat "${s6_service_link}") [ "$1" = "down" ] - eend $? "Failed to stop $RC_SVCNAME" + eend $? "Failed to stop ${name:-$RC_SVCNAME}" } s6_status() diff --git a/sh/start-stop-daemon.sh b/sh/start-stop-daemon.sh index 65ee660..6b679ac 100644 --- a/sh/start-stop-daemon.sh +++ b/sh/start-stop-daemon.sh @@ -46,7 +46,7 @@ ssd_start() ${command_user+--user} $command_user \ $_background $start_stop_daemon_args \ -- $command_args $command_args_background - if eend $? "Failed to start $RC_SVCNAME"; then + if eend $? "Failed to start ${name:-$RC_SVCNAME}"; then service_set_value "command" "${command}" [ -n "${chroot}" ] && service_set_value "chroot" "${chroot}" [ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}" @@ -80,7 +80,7 @@ ssd_stop() ${pidfile:+--pidfile} $chroot$pidfile \ ${stopsig:+--signal} $stopsig - eend $? "Failed to stop $RC_SVCNAME" + eend $? "Failed to stop ${name:-$RC_SVCNAME}" } ssd_status() diff --git a/sh/supervise-daemon.sh b/sh/supervise-daemon.sh index 2d889a6..e6ac117 100644 --- a/sh/supervise-daemon.sh +++ b/sh/supervise-daemon.sh @@ -31,7 +31,7 @@ supervise_start() [ -n "${chroot}" ] && service_set_value "chroot" "${chroot}" [ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}" fi - eend $rc "failed to start $RC_SVCNAME" + eend $rc "failed to start ${name:-$RC_SVCNAME}" } supervise_stop() @@ -46,7 +46,7 @@ supervise_stop() ${pidfile:+--pidfile} $chroot$pidfile \ ${stopsig:+--signal} $stopsig - eend $? "Failed to stop $RC_SVCNAME" + eend $? "Failed to stop ${name:-$RC_SVCNAME}" } supervise_status()