Skip to content

Commit ec4539c

Browse files
johannbgharaldh
authored andcommitted
fix(dracut.sh): add global vars for modules-load
Adding modulesload modulesloadconfdir global variables
1 parent 02acedd commit ec4539c

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

dracut.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1665,6 +1665,16 @@ fi
16651665
16661666
[[ -d $dracutsysrootdir$systemdcatalog ]] || systemdcatalog=${systemdutildir}/catalog
16671667
1668+
[[ -d $dracutsysrootdir$modulesload ]] \
1669+
|| modulesload=$(pkg-config systemd --variable=modulesload 2> /dev/null)
1670+
1671+
[[ -d $dracutsysrootdir$modulesload ]] || modulesload=/usr/lib/modules-load.d
1672+
1673+
[[ -d $dracutsysrootdir$modulesloadconfdir ]] \
1674+
|| modulesloadconfdir=$(pkg-config systemd --variable=modulesloadconfdir 2> /dev/null)
1675+
1676+
[[ -d $dracutsysrootdir$modulesloadconfdir ]] || modulesloadconfdir=/etc/modules-load.d
1677+
16681678
[[ -d $dracutsysrootdir$systemdnetwork ]] \
16691679
|| systemdnetwork=$(pkg-config systemd --variable=systemdnetwork 2> /dev/null)
16701680
@@ -1745,10 +1755,10 @@ export initdir dracutbasedir \
17451755
dbus dbusconfdir dbusinterfaces dbusinterfacesconfdir \
17461756
dbusservices dbusservicesconfdir dbussession dbussessionconfdir \
17471757
dbussystem dbussystemconfdir dbussystemservices dbussystemservicesconfdir \
1748-
environment environmentconfdir sysctl sysctlconfdir sysusers sysusersconfdir \
1749-
systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \
1750-
systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \
1751-
hostonly_cmdline loginstall \
1758+
environment environmentconfdir modulesload modulesloadconfdir sysctl \
1759+
sysctlconfdir sysusers sysusersconfdir systemdutildir systemdutilconfdir \
1760+
systemdcatalog systemdntpunits systemdntpunitsconfdir systemdsystemunitdir \
1761+
systemdsystemconfdir hostonly_cmdline loginstall \
17521762
tmpfilesdir
17531763
17541764
mods_to_load=""

0 commit comments

Comments
 (0)