fix: install all depmod relevant configuration files

haraldh · haraldh · commit 50a01dd4b284 · 2021-05-04T13:15:49.000+02:00
This is important for running `depmod` in the initrd.
diff --git a/dracut.sh b/dracut.sh
@@ -1760,6 +1760,17 @@ if ! [[ -d $dracutsysrootdir$tmpfilesdir ]]; then
     [[ -d $dracutsysrootdir/usr/lib/tmpfiles.d ]] && tmpfilesdir=/usr/lib/tmpfiles.d
 fi
 
+[[ -d $dracutsysrootdir$depmodd ]] \
+    || sysctld=$(pkg-config libkmod --variable=depmodd 2> /dev/null)
+
+[[ -d $dracutsysrootdir$depmodd ]] || depmodd=/usr/lib/depmod.d
+
+[[ -d $dracutsysrootdir$depmodconfdir ]] \
+    || sysctlconfdir=$(pkg-config libkmod --variable=depmodconfdir 2> /dev/null)
+
+[[ -d $dracutsysrootdir$depmodconfdir ]] || depmodconfdir=/etc/depmod.d
+
+
 export initdir dracutbasedir \
     dracutmodules force_add_dracutmodules add_dracutmodules omit_dracutmodules \
     mods_to_load \
@@ -1776,7 +1787,7 @@ export initdir dracutbasedir \
     modulesloadconfdir sysctl sysctlconfdir sysusers sysusersconfdir \
     systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \
     systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \
-    hostonly_cmdline loginstall tmpfilesdir
+    hostonly_cmdline loginstall tmpfilesdir depmodd depmodconfdir
 
 mods_to_load=""
 # check all our modules to see if they should be sourced.
diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
@@ -128,6 +128,11 @@ installkernel() {
         hostonly='' instmods "=crypto"
         instmods "=arch/$arch/crypto" "=drivers/crypto"
     fi
+
+    inst_multiple -o "$depmodd/*.conf"
+    if [[ $hostonly ]]; then
+        inst_multiple -H -o "$depmodconfdir/*.conf"
+    fi
     :
 }
 

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,11 @@ installkernel() {`
`128`	`128`	`hostonly='' instmods "=crypto"`
`129`	`129`	`instmods "=arch/$arch/crypto" "=drivers/crypto"`
`130`	`130`	`fi`
	`131`	`+`
	`132`	`+ inst_multiple -o "$depmodd/*.conf"`
	`133`	`+ if [[ $hostonly ]]; then`
	`134`	`+ inst_multiple -H -o "$depmodconfdir/*.conf"`
	`135`	`+ fi`
`131`	`136`	`:`
`132`	`137`	`}`
`133`	`138`