From ca30cfd341e50bafedc4950713d086bf63f1937c Mon Sep 17 00:00:00 2001 From: Viktor Mihajlovski Date: Tue, 26 Jun 2018 15:00:52 +0200 Subject: [PATCH] netboot: Include compressed kernel modules in initramfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Compressed kernel modules (filename *.ko.xz) would not be included since the script was looking for files with .ko suffix only. This can result in a pxelinux.0 image that can't access the network, which is not good for a network boot loader... Signed-off-by: Viktor Mihajlovski Acked-by: Christian Borntraeger Signed-off-by: Jan Höppner --- CHANGELOG.md | 1 + netboot/mk-pxelinux-ramfs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 291132a3..f9c83d63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Release history for s390-tools (MIT version) Bug Fixes: - mon_procd: fix parsing of /proc//stat + - netboot: Include compressed kernel modules in initramfs * __v2.5.0 (2018-06-08)__ diff --git a/netboot/mk-pxelinux-ramfs b/netboot/mk-pxelinux-ramfs index 51669b28..33e028b6 100755 --- a/netboot/mk-pxelinux-ramfs +++ b/netboot/mk-pxelinux-ramfs @@ -134,8 +134,8 @@ echo "$cmd: Copying virtio modules" mkdir -p $builddir/$netdir mkdir -p $builddir/$blkdir set +e -cp $netdir/virtio_net.ko $builddir/$netdir 2> /dev/null -cp $blkdir/virtio_blk.ko $builddir/$blkdir 2> /dev/null +cp $netdir/virtio_net.ko* $builddir/$netdir 2> /dev/null +cp $blkdir/virtio_blk.ko* $builddir/$blkdir 2> /dev/null set -e # Busybox (+ dependencies)