openrc-run.sh: use RC_LIBEXECDIR from the environment

Author: navi-desu

sh/openrc-run.sh.in

@@ -53,11 +53,11 @@ apply_ulimits()
 	done
 }
 
-sourcex "@LIBEXECDIR@/sh/functions.sh"
-sourcex "@LIBEXECDIR@/sh/rc-functions.sh"
+sourcex "$RC_LIBEXECDIR/sh/functions.sh"
+sourcex "$RC_LIBEXECDIR/sh/rc-functions.sh"
 case $RC_SYS in
 	PREFIX|SYSTEMD-NSPAWN) ;;
-	*) yesno "$RC_USER_SERVICES" || sourcex -e "@LIBEXECDIR@/sh/rc-cgroup.sh";;
+	*) yesno "$RC_USER_SERVICES" || sourcex -e "$RC_LIBEXECDIR/sh/rc-cgroup.sh";;
 esac
 
 # Support LiveCD foo
@@ -263,10 +263,10 @@ fi
 unset _usr_conf
 
 # load service supervisor functions
-sourcex "@LIBEXECDIR@/sh/runit.sh"
-sourcex "@LIBEXECDIR@/sh/s6.sh"
-sourcex "@LIBEXECDIR@/sh/start-stop-daemon.sh"
-sourcex "@LIBEXECDIR@/sh/supervise-daemon.sh"
+sourcex "$RC_LIBEXECDIR/sh/runit.sh"
+sourcex "$RC_LIBEXECDIR/sh/s6.sh"
+sourcex "$RC_LIBEXECDIR/sh/start-stop-daemon.sh"
+sourcex "$RC_LIBEXECDIR/sh/supervise-daemon.sh"
 
 # Load our script
 sourcex "$RC_SERVICE"

src/shared/misc.c

@@ -59,7 +59,7 @@ static const char *const env_allowlist[] = {
 	"EERROR_QUIET", "EINFO_QUIET",
 	"IN_BACKGROUND", "IN_DRYRUN", "IN_HOTPLUG",
 	"RC_DEBUG", "RC_NODEPS", "RC_USER_SERVICES",
-	"RC_SCRIPTDIRS", "RC_SVCDIR",
+	"RC_SCRIPTDIRS", "RC_SVCDIR", "RC_LIBEXECDIR"
 	"LANG", "LC_MESSAGES", "TERM",
 	"EINFO_COLOR", "EINFO_VERBOSE",
 	NULL
@@ -216,11 +216,13 @@ env_config(void)
 		free(cachedir);
 	}
 
+	e = getenv("RC_LIBEXECDIR");
+	setenv("RC_LIBEXECDIR", e ? e : RC_LIBEXECDIR, 1);
+
 	xasprintf(&tmpdir, "%s/tmp", svcdir);
 	e = rc_runlevel_get();
 
 	setenv("RC_VERSION", VERSION, 1);
-	setenv("RC_LIBEXECDIR", RC_LIBEXECDIR, 1);
 	setenv("RC_SVCDIR", svcdir, 1);
 	setenv("RC_TMPDIR", tmpdir, 1);
 	setenv("RC_BOOTLEVEL", RC_LEVEL_BOOT, 1);