aboutsummaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2017-08-15 17:15:14 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2017-08-15 17:15:14 -0500
commit66ed8082d0c865a0b4f4cc436cf9e13351e3d6fe (patch)
tree2f0ac98bbc40b67665d8018f3ce1f03aedd24b4d /sh
parentc2d256bafb9d1dfafbfd0846c035c5d26f7449c8 (diff)
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.
Diffstat (limited to 'sh')
-rw-r--r--sh/openrc-run.sh.in6
1 files 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"