Merge branch 'master' of https://projects.archlinux.org/git/initscripts into parabola

1 files changed, 8 insertions, 2 deletions

diff --git a/rc b/rc
index 1e64119..743d86b 100755
--- a/rc
+++ b/rc
@@ -43,9 +43,15 @@ case $1 in
 	*)
 		action=$1
 		shift
+		# set same environment variables as init
+		runlevel=$(/sbin/runlevel)
+		ENV="PATH='/bin:/usr/bin:/sbin:/usr/sbin'"
+		ENV+=" PREVLEVEL='${runlevel:0:1}'"
+		ENV+=" RUNLEVEL='${runlevel:2:1}'"
+		ENV+=" CONSOLE='${CONSOLE:-/dev/console}'"
 		for i; do
-			[[ -x "/etc/rc.d/$i" ]] && "/etc/rc.d/$i" $action
-			(( ret += $? ))
+			[[ -x "/etc/rc.d/$i" ]] && cd / && eval /usr/bin/env -i $ENV "/etc/rc.d/$i" "$action"
+			(( ret += !! $? ))  # clamp exit value to 0/1
 		done
 esac