From: Jóhann B. Guðmundsson <johannbg@gmail.com>
Date: Tue, 20 Apr 2021 13:56:48 +0000 (+0000)
Subject: fix(dracut.sh): add global vars for modules-load
X-Git-Tag: 054~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec4539c6066edf25e52ed8e2d35c4be7ef39f729;p=thirdparty%2Fdracut.git

fix(dracut.sh): add global vars for modules-load

Adding modulesload modulesloadconfdir global variables
---

diff --git a/dracut.sh b/dracut.sh
index 577b7fa1f..d72ac7fab 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1665,6 +1665,16 @@ fi
 
 [[ -d $dracutsysrootdir$systemdcatalog ]] || systemdcatalog=${systemdutildir}/catalog
 
+[[ -d $dracutsysrootdir$modulesload ]] \
+    || modulesload=$(pkg-config systemd --variable=modulesload 2> /dev/null)
+
+[[ -d $dracutsysrootdir$modulesload ]] || modulesload=/usr/lib/modules-load.d
+
+[[ -d $dracutsysrootdir$modulesloadconfdir ]] \
+    || modulesloadconfdir=$(pkg-config systemd --variable=modulesloadconfdir 2> /dev/null)
+
+[[ -d $dracutsysrootdir$modulesloadconfdir ]] || modulesloadconfdir=/etc/modules-load.d
+
 [[ -d $dracutsysrootdir$systemdnetwork ]] \
     || systemdnetwork=$(pkg-config systemd --variable=systemdnetwork 2> /dev/null)
 
@@ -1745,10 +1755,10 @@ export initdir dracutbasedir \
     dbus dbusconfdir dbusinterfaces dbusinterfacesconfdir \
     dbusservices dbusservicesconfdir dbussession dbussessionconfdir \
     dbussystem dbussystemconfdir dbussystemservices dbussystemservicesconfdir \
-    environment environmentconfdir sysctl sysctlconfdir sysusers sysusersconfdir \
-    systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \
-    systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \
-    hostonly_cmdline loginstall \
+    environment environmentconfdir modulesload modulesloadconfdir sysctl \
+    sysctlconfdir sysusers sysusersconfdir systemdutildir systemdutilconfdir \
+    systemdcatalog systemdntpunits systemdntpunitsconfdir systemdsystemunitdir \
+    systemdsystemconfdir hostonly_cmdline loginstall \
     tmpfilesdir
 
 mods_to_load=""