add source_conf for static configuration variables

source_conf sources all *.conf files of a directory

init will now source all /etc/conf.d/*.conf files

diff --git a/modules.d/95iscsi/iscsiroot b/modules.d/95iscsi/iscsiroot
index 5eff62503eef717afa84f6fe0f81f47b3a4e5614..f0dbdaaa366b44b3361d5a4aebcc014e095399b0 100755 (executable)
--- a/modules.d/95iscsi/iscsiroot
+++ b/modules.d/95iscsi/iscsiroot
@@ -30,10 +30,7 @@ fi
 netif="$1"
 root="$2"
 
-# read static conf settings
-for conf in conf/conf.d/*; do
-    [ -f ${conf} ] && . ${conf}
-done
+source_all /etc/conf.d
 
 # If it's not iscsi we don't continue
 [ "${root%%:*}" = "iscsi" ] || exit 1

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index f9182cfd773583aab4f8b4493b618569365c9856..f007fccf8f9109607cddca6ae28956e579d53486 100644 (file)
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -28,6 +28,12 @@ source_all() {
     for f in "/$1"/*.sh; do [ -f "$f" ] && . "$f"; done
 }
 
+source_conf() {
+    local f
+    [ "$1" ] && [  -d "/$1" ] || return
+    for f in "/$1"/*.conf; do [ -f "$f" ] && . "$f"; done
+}
+
 die() {
     {
         echo "<1>dracut: FATAL: $@";

diff --git a/modules.d/99base/init b/modules.d/99base/init
index 431d2e8e8c6b79f65dbf5390be8d794ea39d5dd9..36f1a0783151f86f637edf0d37e82c364b8e1115 100755 (executable)
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -59,6 +59,8 @@ mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts >/dev/null 2>&1
 
 UDEVVERSION=$(udevadm --version)
 
+source_conf /etc/conf.d
+
 # run scriptlets to parse the command line
 getarg 'rdbreak=cmdline' && emergency_shell "Break before cmdline"
 source_all cmdline