From 9a6698876af1c7563ae7a3237111fc43cf4f5bda Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Tue, 5 Jan 2021 17:02:30 -0600
Subject: improve the diagnostic when the ulimit builtin fails

X-Gentoo-Bug:739274
X-Gentoo-Bug-URL:https://bugs.gentoo.org/739274
---
 sh/openrc-run.sh.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'sh/openrc-run.sh.in')

diff --git a/sh/openrc-run.sh.in b/sh/openrc-run.sh.in
index 7e9064c2..06f46908 100644
--- a/sh/openrc-run.sh.in
+++ b/sh/openrc-run.sh.in
@@ -254,8 +254,11 @@ fi
 for _cmd; do
 	if [ "$_cmd" != status -a "$_cmd" != describe ]; then
 		# Apply any ulimit defined
-		[ -n "${rc_ulimit:-$RC_ULIMIT}" ] && \
-			ulimit ${rc_ulimit:-$RC_ULIMIT}
+		if [ -n "${rc_ulimit:-$RC_ULIMIT}" ]; then
+			if ! ulimit ${rc_ulimit:-$RC_ULIMIT}; then
+				eerror "${RC_SVCNAME: unable to apply RC_ULIMIT settings"
+			fi
+		fi
 		# Apply cgroups settings if defined
 		if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]
 		then
-- 
cgit v1.2.3