mirror/openrc
1
0
Fork 0
mirror of https://github.com/OpenRC/openrc.git synced 2026-01-26 08:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

openrc-run: load conf.d from RC_PATH

Browse Source 
generalizing the logic via RC_PATH makes it more flexible, and allows
better usage of multiple unique init directories

we load the config directories in reverse order so that "overriding"
works as intended, i.e., /etc takes preference over /usr

this also makes config directories additive, while init directories are
completely replace each other, config directories are combine, meaning
to change one setting, only that setting needs to be presented in a
higher-priority conf.d
This commit is contained in:
Anna (navi) Figueiredo Gomes 2025-11-03 02:24:04 +01:00 committed by navi
parent db54d91126
commit 06e098a4aa
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sh/openrc-run.sh.in
View File

@ -225,47 +225,38 @@ status()
# Start debug output
yesno $RC_DEBUG && set -x
# Parse RC_PATH in reverse order, so later conf.d files override earlier ones
IFS=:
for _f in $RC_PATH; do
_conf_d="$_f $_conf_d"
done
unset IFS
# Load configuration settings. First the global ones, then any
# service-specific settings.
sourcex -e "@SYSCONFDIR@/rc.conf"
if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
for _f in $_conf_d; do
sourcex -e "$_f/rc.conf"
for _f in "$_f"/rc.conf.d/*.conf; do
sourcex -e "$_f"
done
fi
done
_usr_conf=${XDG_CONFIG_HOME:-${HOME}/.config}/rc
if yesno "$RC_USER_SERVICES"; then
sourcex -e "$_usr_conf/rc.conf"
if [ -d "$_usr_conf/rc.conf.d" ]; then
for _f in "$_usr_conf"/rc.conf.d/*.conf; do
sourcex -e "$_f"
done
fi
fi
_conf_d=${RC_SERVICE%/*}/../conf.d
# If we're net.eth0 or openvpn.work then load net or openvpn config
_c=${RC_SVCNAME%%.*}
if [ -n "$_c" -a "$_c" != "$RC_SVCNAME" ]; then
if ! sourcex -e "$_conf_d/$_c.$RC_RUNLEVEL"; then
sourcex -e "$_conf_d/$_c"
fi
if [ "$_c" != "$RC_SVCNAME" ]; then
# Overlay with our specific config
_c="$_c $RC_SVCNAME"
fi
unset _c
# Overlay with our specific config
if ! sourcex -e "$_conf_d/$RC_SVCNAME.$RC_RUNLEVEL"; then
sourcex -e "$_conf_d/$RC_SVCNAME"
fi
unset _conf_d
for _c in $_c; do
for _f in $_conf_d; do
if ! sourcex -e "$_f/$_c.$RC_RUNLEVEL"; then
sourcex -e "$_f/$_c"
fi
done
done
if yesno "$RC_USER_SERVICES" && [ "$_usr_conf/init.d" != "${RC_SERVICE%/*}" ]; then
if ! sourcex -e "$_usr_conf/conf.d/$RC_SVCNAME.$RC_RUNLEVEL"; then
sourcex -e "$_usr_conf/conf.d/$RC_SVCNAME"
fi
fi
unset _usr_conf
unset _c _f _conf_d
# load service supervisor functions
sourcex "@LIBEXECDIR@/sh/runit.sh"