mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
pvebc: Fix kernel module dependencies
Include the required kernel modules unconditionally when this module is installed into an initramfs. The new .conf file contains a list of kernel modules that are loaded by the systemd-modules-load.service systemd unit. Reviewed-by: Holger Dengler <dengler@linux.ibm.com> Signed-off-by: Finn Callies <fcallies@linux.ibm.com> Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
committed by
Jan Höppner
parent
d1ab6be082
commit
9237c5b675
@@ -114,6 +114,7 @@ ifneq ($(HAVE_DRACUT),0)
|
||||
$(INSTALL) -m 755 pvebc/$(SEL_EBC_MODDIR)/module-setup.sh \
|
||||
pvebc/$(SEL_EBC_MODDIR)/override-crypttab.sh \
|
||||
pvebc/$(SEL_EBC_MODDIR)/pvebc-wrapper.sh \
|
||||
pvebc/$(SEL_EBC_MODDIR)/sel-ebc-modules.conf \
|
||||
$(DESTDIR)$(DRACUTMODDIR)/$(SEL_EBC_MODDIR)
|
||||
$(INSTALL) -m 644 pvebc/$(SEL_EBC_MODDIR)/boot.mount \
|
||||
pvebc/$(SEL_EBC_MODDIR)/sel-ebc-override-crypttab.service \
|
||||
|
||||
@@ -23,11 +23,11 @@ depends() {
|
||||
# Called by dracut
|
||||
installkernel() {
|
||||
# kernel modules needed for opening an encrypted rfs
|
||||
instmods -c uvdevice
|
||||
instmods -c paes_s390
|
||||
instmods -c pkey_uv
|
||||
instmods -c pkey_pckmo
|
||||
instmods -c pkey
|
||||
hostonly='' instmods -c uvdevice
|
||||
hostonly='' instmods -c paes_s390
|
||||
hostonly='' instmods -c pkey_uv
|
||||
hostonly='' instmods -c pkey_pckmo
|
||||
hostonly='' instmods -c pkey
|
||||
}
|
||||
|
||||
# Called by dracut
|
||||
@@ -58,6 +58,10 @@ install() {
|
||||
inst_simple "$moddir/override-crypttab.sh" \
|
||||
"/etc/sel-ebc/override-crypttab.sh"
|
||||
|
||||
# install kernel module dependencies
|
||||
inst_simple "$moddir/sel-ebc-modules.conf" \
|
||||
"/usr/lib/modules-load.d/sel-ebc-modules.conf"
|
||||
|
||||
# copy main application
|
||||
inst_binary "/usr/bin/pvebc"
|
||||
inst_binary "/usr/bin/pvsecret"
|
||||
|
||||
5
rust/pvebc/95sel-ebc/sel-ebc-modules.conf
Normal file
5
rust/pvebc/95sel-ebc/sel-ebc-modules.conf
Normal file
@@ -0,0 +1,5 @@
|
||||
uvdevice
|
||||
paes_s390
|
||||
pkey_uv
|
||||
pkey_pckmo
|
||||
pkey
|
||||
Reference in New Issue
Block a user