[PATCH 2/2] Move S390MODS to inside makeBootImages(), remove libiscsi_tcp.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Since s390x is building a list of arch-specific modules for the
initrd.img based on what exists in /lib/modules/VERSION/kernel/s390, we
need to build the list inside makeBootImages() so that all required
variables are set up and the kernel is unpacked.

Remove libiscsi_tcp from the list since the iscsi modules are included
when INITRDMODS is expanded in mk-images.
---
 scripts/mk-images.s390 |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index 50d0f8d..2de6819 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -28,14 +28,11 @@ getAllS390ModuleNames() {
     fi
 }
 
-S390BASEMODS="$(getAllS390ModuleNames)"
-S390MODS="$S390BASEMODS libiscsi_tcp"
-
 makeBootImages() {
 	makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
 	    --initrdsize 20000 \
 	    --loaderbin loader \
-	    --modules "$INITRDMODS $S390MODS"
+	    --modules "$INITRDMODS $(getAllS390ModuleNames)"
 	sz=$(ls -l $TOPDESTPATH/images/initrd.img | awk '{print $5}')
 	$GENINITRDSZ $sz $TOPDESTPATH/images/initrd.size
 	cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/kernel.img
-- 
1.6.2.5

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux