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 07BA1138334 for ; Fri, 14 Dec 2018 09:33:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3861E08F4; Fri, 14 Dec 2018 09:33:15 +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 A2E02E08F4 for ; Fri, 14 Dec 2018 09:33:15 +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 B9FC4335C5D for ; Fri, 14 Dec 2018 09:33:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A4704E0 for ; Fri, 14 Dec 2018 09:33:11 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1544779977.32ba22e24c5cea585026ffa6d6d45d67c7bb64ea.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/rasdaemon/files/ras-mc-ctl.openrc-r1 app-admin/rasdaemon/files/rasdaemon.openrc-r1 app-admin/rasdaemon/rasdaemon-0.6.2-r2.ebuild app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild X-VCS-Directories: app-admin/rasdaemon/files/ app-admin/rasdaemon/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 32ba22e24c5cea585026ffa6d6d45d67c7bb64ea X-VCS-Branch: master Date: Fri, 14 Dec 2018 09:33:11 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0e705b9a-8da0-4d8b-96b7-f5a299954f14 X-Archives-Hash: e1a417466b6de3d9aa5180431fdd6488 commit: 32ba22e24c5cea585026ffa6d6d45d67c7bb64ea Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Dec 14 08:39:59 2018 +0000 Commit: Matthew Thode gentoo org> CommitDate: Fri Dec 14 09:32:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32ba22e2 app-admin/rasdaemon: fix multiple issues with initscripts Brush up initscripts so they properly start, stop, log and don't clobber output. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> Signed-off-by: Matthew Thode gentoo.org> app-admin/rasdaemon/files/ras-mc-ctl.openrc-r1 | 23 +++++++++++++++++++++ app-admin/rasdaemon/files/rasdaemon.openrc-r1 | 24 ++++++++++++++++++++++ ...n-0.6.2-r2.ebuild => rasdaemon-0.6.2-r3.ebuild} | 4 ++-- 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/app-admin/rasdaemon/files/ras-mc-ctl.openrc-r1 b/app-admin/rasdaemon/files/ras-mc-ctl.openrc-r1 new file mode 100644 index 00000000000..316b28ad714 --- /dev/null +++ b/app-admin/rasdaemon/files/ras-mc-ctl.openrc-r1 @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="Loads Motherboard DIMM labels into EDAC driver" + +depend() { + keyword -stop + need sysfs +} + +command="/usr/sbin/ras-mc-ctl" +command_args="--register-labels" + +start() { + ebegin "Loading Motherboard DIMM labels into EDAC driver" + "${command}" "${command_args}" + eend $? +} + +stop() { + : +} diff --git a/app-admin/rasdaemon/files/rasdaemon.openrc-r1 b/app-admin/rasdaemon/files/rasdaemon.openrc-r1 new file mode 100644 index 00000000000..6532826add5 --- /dev/null +++ b/app-admin/rasdaemon/files/rasdaemon.openrc-r1 @@ -0,0 +1,24 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="Starts Reliablity, Availability and Serviceability (RAS) service" + +depend() { + need localmount + use logger +} + +command="/usr/sbin/rasdaemon" +command_args="--foreground --record" +command_background=true +pidfile=/run/${RC_SVCNAME}.pid + + +start_post() { + "${command}" --enable >/dev/null 2>&1 +} + +stop_post() { + "${command}" --disable >/dev/null 2>&1 +} diff --git a/app-admin/rasdaemon/rasdaemon-0.6.2-r2.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild similarity index 90% rename from app-admin/rasdaemon/rasdaemon-0.6.2-r2.ebuild rename to app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild index 0e27e9fe31e..fca06e7b0f0 100644 --- a/app-admin/rasdaemon/rasdaemon-0.6.2-r2.ebuild +++ b/app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild @@ -52,6 +52,6 @@ src_install() { systemd_dounit misc/*.service - newinitd "${FILESDIR}/rasdaemon.openrc" rasdaemon - newinitd "${FILESDIR}/ras-mc-ctl.openrc" ras-mc-ctl + newinitd "${FILESDIR}/rasdaemon.openrc-r1" rasdaemon + newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl }