fix: install all depmod relevant configuration files

This is important for running `depmod` in the initrd.
master
Harald Hoyer 2021-05-04 11:42:46 +02:00 committed by Harald Hoyer
parent 87c4c17850
commit 50a01dd4b2
2 changed files with 17 additions and 1 deletions

View File

@ -1760,6 +1760,17 @@ if ! [[ -d $dracutsysrootdir$tmpfilesdir ]]; then
[[ -d $dracutsysrootdir/usr/lib/tmpfiles.d ]] && tmpfilesdir=/usr/lib/tmpfiles.d [[ -d $dracutsysrootdir/usr/lib/tmpfiles.d ]] && tmpfilesdir=/usr/lib/tmpfiles.d
fi 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 \ export initdir dracutbasedir \
dracutmodules force_add_dracutmodules add_dracutmodules omit_dracutmodules \ dracutmodules force_add_dracutmodules add_dracutmodules omit_dracutmodules \
mods_to_load \ mods_to_load \
@ -1776,7 +1787,7 @@ export initdir dracutbasedir \
modulesloadconfdir sysctl sysctlconfdir sysusers sysusersconfdir \ modulesloadconfdir sysctl sysctlconfdir sysusers sysusersconfdir \
systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \ systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \
systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \ systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \
hostonly_cmdline loginstall tmpfilesdir hostonly_cmdline loginstall tmpfilesdir depmodd depmodconfdir


mods_to_load="" mods_to_load=""
# check all our modules to see if they should be sourced. # check all our modules to see if they should be sourced.

View File

@ -128,6 +128,11 @@ installkernel() {
hostonly='' instmods "=crypto" hostonly='' instmods "=crypto"
instmods "=arch/$arch/crypto" "=drivers/crypto" instmods "=arch/$arch/crypto" "=drivers/crypto"
fi fi

inst_multiple -o "$depmodd/*.conf"
if [[ $hostonly ]]; then
inst_multiple -H -o "$depmodconfdir/*.conf"
fi
: :
} }