dracut/0537-dracut-init.sh-ignore-crc32.ko-in-builtin-test.patch
Marcus Meissner e6be739410 Accepting request 519492 from home:dmolkentin:branches:Base:System
- 90multipath: Remove compat rule that is no longer needed (bsc#1054539)
 * adds 0536-90multipath-drop-67-kpartx-compat.rules.patch
- Don't detect crc32.ko as built-in (bsc#1054538)
 * adds 0537-dracut-init.sh-ignore-crc32.ko-in-builtin-test.patch
- Enable systemd-based core dumps for initrd (bsc#1054809)
 * adds 0538-Enable-core-dumps-with-systemd-from-initrd.patch

OBS-URL: https://build.opensuse.org/request/show/519492
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=319
2017-09-07 12:03:50 +00:00

32 lines
1.0 KiB
Diff

From c909fcc8e1b34098e2ec58cd585df0dbb8c3ec3c Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.com>
Date: Wed, 19 Jul 2017 01:25:13 +0200
Subject: [PATCH 2/2] dracut-init.sh: ignore crc32.ko in builtin test
crc32.ko exists twice in certain kernels (e.g. SLE12): as
/kernel/lib/crc32.ko (SLE12: builtin) and as kernel/crypto/crc32.ko
(SLE12: module). When the latter module is necessary, dracut
falsely classifies it as builtin. Fix that.
Reference: bsc#1054538
---
dracut-init.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut-init.sh b/dracut-init.sh
index 3f30cc9c..65597ffa 100644
--- a/dracut-init.sh
+++ b/dracut-init.sh
@@ -1137,7 +1137,7 @@ instmods() {
return 0
fi
- if grep -q "/${_mod}.ko" $srcmods/modules.builtin; then
+ if [[ ${_mod} != crc32 ]] && grep -q "/${_mod}.ko" $srcmods/modules.builtin; then
# Module is built-in
return 0
fi
--
2.12.3