From 66ed8082d0c865a0b4f4cc436cf9e13351e3d6fe Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Tue, 15 Aug 2017 17:15:14 -0500 Subject: 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(-) (limited to 'sh') 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" -- cgit v1.2.3