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 A62411396D0 for ; Tue, 15 Aug 2017 22:19:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E80E01FC002; Tue, 15 Aug 2017 22:19:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C2DAC1FC002 for ; Tue, 15 Aug 2017 22:19:05 +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 B8B4834183B for ; Tue, 15 Aug 2017 22:19:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B29F75DD for ; Tue, 15 Aug 2017 22:19:01 +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: <1502835314.66ed8082d0c865a0b4f4cc436cf9e13351e3d6fe.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/openrc-run.sh.in X-VCS-Directories: sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 66ed8082d0c865a0b4f4cc436cf9e13351e3d6fe X-VCS-Branch: master Date: Tue, 15 Aug 2017 22:19:01 +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: b3d3c3da-95ef-466d-98b7-edd756f9adf8 X-Archives-Hash: e61ae81fa7e48db6d021dc68d9fe0abf commit: 66ed8082d0c865a0b4f4cc436cf9e13351e3d6fe Author: William Hubbs gmail com> AuthorDate: Tue Aug 15 22:15:14 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Aug 15 22:15:14 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=66ed8082 sh/openrc-run: source service script before ulimit is processed This is needed to allow the service script author to set a default for rc_ulimit inside the service script. sh/openrc-run.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sh/openrc-run.sh.in b/sh/openrc-run.sh.in index f5ffe17e..a38d46d6 100644 --- a/sh/openrc-run.sh.in +++ b/sh/openrc-run.sh.in @@ -243,6 +243,9 @@ sourcex "@LIBEXECDIR@/sh/s6.sh" sourcex "@LIBEXECDIR@/sh/start-stop-daemon.sh" sourcex "@LIBEXECDIR@/sh/supervise-daemon.sh" +# Load our script +sourcex "$RC_SERVICE" + # Set verbose mode if yesno "${rc_verbose:-$RC_VERBOSE}"; then EINFO_VERBOSE=yes @@ -272,9 +275,6 @@ for _cmd; do fi done -# Load our script -sourcex "$RC_SERVICE" - eval "printf '%s\n' $required_dirs" | while read _d; do if [ -n "$_d" ] && [ ! -d "$_d" ]; then eerror "$RC_SVCNAME: \`$_d' is not a directory"