From e6be739410a71d4be8e5364838a296302ddf53ed4de528fb3ccc5bf06231c841 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 7 Sep 2017 12:03:50 +0000 Subject: [PATCH] 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 --- ...ultipath-drop-67-kpartx-compat.rules.patch | 28 +++++++++++++++++ ...t.sh-ignore-crc32.ko-in-builtin-test.patch | 31 +++++++++++++++++++ ...-core-dumps-with-systemd-from-initrd.patch | 29 +++++++++++++++++ dracut.changes | 12 +++++++ dracut.spec | 6 ++++ 5 files changed, 106 insertions(+) create mode 100644 0536-90multipath-drop-67-kpartx-compat.rules.patch create mode 100644 0537-dracut-init.sh-ignore-crc32.ko-in-builtin-test.patch create mode 100644 0538-Enable-core-dumps-with-systemd-from-initrd.patch diff --git a/0536-90multipath-drop-67-kpartx-compat.rules.patch b/0536-90multipath-drop-67-kpartx-compat.rules.patch new file mode 100644 index 0000000..1a68441 --- /dev/null +++ b/0536-90multipath-drop-67-kpartx-compat.rules.patch @@ -0,0 +1,28 @@ +From 684d83b9492b8a8323f4b99d4384e56c7c7b3580 Mon Sep 17 00:00:00 2001 +From: Martin Wilck +Date: Mon, 14 Aug 2017 16:43:45 +0200 +Subject: [PATCH 1/2] 90multipath: drop 67-kpartx-compat.rules + +This file is obsolete in SLE-15 and Factory. + +Reference: bsc#1054539 +--- + modules.d/90multipath/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh +index 4f342c89..85848068 100755 +--- a/modules.d/90multipath/module-setup.sh ++++ b/modules.d/90multipath/module-setup.sh +@@ -118,7 +118,7 @@ install() { + + inst_rules 40-multipath.rules 56-multipath.rules \ + 62-multipath.rules 65-multipath.rules \ +- 66-kpartx.rules 67-kpartx-compat.rules \ ++ 66-kpartx.rules \ + 11-dm-mpath.rules + } + +-- +2.12.3 + diff --git a/0537-dracut-init.sh-ignore-crc32.ko-in-builtin-test.patch b/0537-dracut-init.sh-ignore-crc32.ko-in-builtin-test.patch new file mode 100644 index 0000000..7ba6f58 --- /dev/null +++ b/0537-dracut-init.sh-ignore-crc32.ko-in-builtin-test.patch @@ -0,0 +1,31 @@ +From c909fcc8e1b34098e2ec58cd585df0dbb8c3ec3c Mon Sep 17 00:00:00 2001 +From: Martin Wilck +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 + diff --git a/0538-Enable-core-dumps-with-systemd-from-initrd.patch b/0538-Enable-core-dumps-with-systemd-from-initrd.patch new file mode 100644 index 0000000..512433b --- /dev/null +++ b/0538-Enable-core-dumps-with-systemd-from-initrd.patch @@ -0,0 +1,29 @@ +From c15c37986d9387c7f7d1020bd7ca17f890ae6276 Mon Sep 17 00:00:00 2001 +From: Daniel Molkentin +Date: Tue, 29 Aug 2017 08:46:07 +0200 +Subject: [PATCH] Enable core dumps with systemd from initrd + +systemd sets /proc/sys/kernel/core_pattern to use systemd-coredump. +However, systemd-coredump is missing from initrd, making dumping +the core in initrd impossible by default. + +Reference: bsc#1054809 +--- + modules.d/00systemd/module-setup.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh +index 86728208..14b3ab07 100755 +--- a/modules.d/00systemd/module-setup.sh ++++ b/modules.d/00systemd/module-setup.sh +@@ -33,6 +33,7 @@ install() { + + inst_multiple -o \ + $systemdutildir/systemd \ ++ $systemdutildir/systemd-coredump \ + $systemdutildir/systemd-cgroups-agent \ + $systemdutildir/systemd-shutdown \ + $systemdutildir/systemd-reply-password \ +-- +2.12.3 + diff --git a/dracut.changes b/dracut.changes index d52c120..39174b8 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Aug 29 13:46:38 UTC 2017 - daniel.molkentin@suse.com + +- 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 + ------------------------------------------------------------------- Mon Aug 28 13:42:33 UTC 2017 - mmarek@suse.com diff --git a/dracut.spec b/dracut.spec index 8076a50..93650f4 100644 --- a/dracut.spec +++ b/dracut.spec @@ -217,6 +217,9 @@ Patch532: 0532-List-drivers-rather-than-looking-for-reverse-depende.patch Patch533: 0533-instmods-check-modules.builtin-in-srcmods.patch Patch534: 0534-ssh-client-Include-nss_-libraries.patch Patch535: 0535-Sync-initramfs-after-creation.patch +Patch536: 0536-90multipath-drop-67-kpartx-compat.rules.patch +Patch537: 0537-dracut-init.sh-ignore-crc32.ko-in-builtin-test.patch +Patch538: 0538-Enable-core-dumps-with-systemd-from-initrd.patch BuildRequires: asciidoc BuildRequires: bash @@ -461,6 +464,9 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh %patch533 -p1 %patch534 -p1 %patch535 -p1 +%patch536 -p1 +%patch537 -p1 +%patch538 -p1 %build %configure\