diff options
| author | David Cantrell <dcantrell@redhat.com> | 2009-09-21 15:15:14 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2009-09-21 17:19:43 -1000 |
| commit | a7c45f4b2ca25407d8a959f05986cd6481dd905b (patch) | |
| tree | 6e58f46630f02bd3785781d9071b59a8cb8f6a02 | |
| parent | 3864f853ddd36329d4cdb6881f6f41ee0bc65975 (diff) | |
| download | anaconda-a7c45f4b2ca25407d8a959f05986cd6481dd905b.tar.gz anaconda-a7c45f4b2ca25407d8a959f05986cd6481dd905b.tar.xz anaconda-a7c45f4b2ca25407d8a959f05986cd6481dd905b.zip | |
Start with all modules from kernel/drivers/s390 on s390x (#524566)
The modules.ccwmap file is not in the latest kernel tree for whatever
tree. Start the s390x module list with all modules from the
s390-specific module subdirectory in /lib/modules, then read in any
additional ones that might apply to the installation.
| -rw-r--r-- | scripts/mk-images.s390 | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390 index 94b72f23d..308afcfba 100644 --- a/scripts/mk-images.s390 +++ b/scripts/mk-images.s390 @@ -17,6 +17,15 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +getAllS390ModuleNames() { + s390dir="${KERNELROOT}/lib/modules/${version}/kernel/drivers/s390" + if [ -d "${s390dir}" ]; then + find ${s390dir} -type f -name "*.ko" | while read line ; do + echo "$(basename ${line} .ko)" + done | sort | uniq | tr '\n' ' ' + fi +} + collectModuleNames() { grep -v "^#" ${KERNELROOT}/lib/modules/${version}/modules.${1} | \ cut -d ' ' -f 1 | sort | uniq | \ @@ -63,10 +72,11 @@ expandModuleDeps() { rm -f "${DEPSFILE}" } +S390BASEMODS="$(getAllS390ModuleNames)" S390CCWMODS="$(collectModuleNames ccwmap)" +S390BLOCKMODS="$(collectModuleNames block)" S390NETMODS="$(collectModuleNames networking)" -S390EXTRAMODS="dasd_diag_mod smsgiucv" -S390MODS="$(expandModuleDeps $S390CCWMODS $S390NETMODS $S390EXTRAMODS)" +S390MODS="$(expandModuleDeps $S390BASEMODS $S390CCWMODS $S390BLOCKMODS $S390NETMODS)" makeBootImages() { makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \ |