53e9906e08
- support vlan tagged binding - speedup initramfs emergency service - speedup image creation - fix installkernel() return codes Resolves: rhbz#833256 - add qemu and qemu-net modules to add qemu drivers even in host-only - speedup btrfs and xfs fsck (nop) - no more mknod in the initramfs (fixes plymouth on s390)
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 0663a883d77149b505cb08671d2ebd054eb5bc28 Mon Sep 17 00:00:00 2001
|
|
From: Harald Hoyer <harald@redhat.com>
|
|
Date: Fri, 22 Jun 2012 15:32:15 +0200
|
|
Subject: [PATCH] kernel-modules/module-setup.sh:installkernel() fix return
|
|
code
|
|
|
|
---
|
|
modules.d/90kernel-modules/module-setup.sh | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
|
|
index 1d39c85..08f745a 100755
|
|
--- a/modules.d/90kernel-modules/module-setup.sh
|
|
+++ b/modules.d/90kernel-modules/module-setup.sh
|
|
@@ -16,6 +16,7 @@ installkernel() {
|
|
*.ko.xz) [[ $(xz -dc <$_f) =~ $_blockfuncs ]] && echo "$_f" ;;
|
|
esac
|
|
done
|
|
+ return 0
|
|
}
|
|
function rotor() {
|
|
local _f1 _f2
|
|
@@ -25,12 +26,15 @@ installkernel() {
|
|
echo "$_f2" 1>&${_side2}
|
|
fi
|
|
done | bmf1 1>&${_merge}
|
|
+ return 0
|
|
}
|
|
# Use two parallel streams to filter alternating modules.
|
|
set +x
|
|
eval "( ( rotor ) ${_side2}>&1 | bmf1 ) ${_merge}>&1"
|
|
[[ $debug ]] && set -x
|
|
+ return 0
|
|
}
|
|
+
|
|
hostonly='' instmods sr_mod sd_mod scsi_dh scsi_dh_rdac scsi_dh_emc ata_piix
|
|
hostonly='' instmods pcmcia firewire-ohci
|
|
hostonly='' instmods usb_storage sdhci sdhci-pci
|