diff options
| author | David Cantrell <dcantrell@redhat.com> | 2009-09-24 15:55:21 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2009-09-25 14:23:09 -1000 |
| commit | 2986ed0578a758ffa692ee70d6b69a853c6cc233 (patch) | |
| tree | 110781eabd4d9f37cfafe3cb48f58838bb7786c1 /scripts | |
| parent | 6707e067d6c46ed6e82a62dfbd6fe9a87ce55e5d (diff) | |
| download | anaconda-2986ed0578a758ffa692ee70d6b69a853c6cc233.tar.gz anaconda-2986ed0578a758ffa692ee70d6b69a853c6cc233.tar.xz anaconda-2986ed0578a758ffa692ee70d6b69a853c6cc233.zip | |
Move S390MODS to inside makeBootImages(), remove libiscsi_tcp.
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.
Diffstat (limited to 'scripts')
| -rw-r--r-- | 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 50d0f8d66..2de68192e 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 |