Accepting request 767880 from home:mwilck:branches:Kernel:kdump

https://github.com/openSUSE/kdump/pull/13

- kdump-activate-udev-rules-late-during-boot.patch: Activate
  kdump udev rules late during boot (bsc#1154837)

OBS-URL: https://build.opensuse.org/request/show/767880
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=193

kdump-activate-udev-rules-late-during-boot.patch

@@ -0,0 +1,45 @@
+From 3405c3b3b53f35459f425d7cf3c0ffaf759cade4 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <mwilck@suse.com>
+Date: Mon, 27 Jan 2020 17:30:24 +0100
+Subject: [PATCH] kdump: activate udev rules late during boot
+
+The kdump udev rule is very broad in scope and may slow down
+booting strongly, especially during the coldplug phase where
+"add" events for lots of CPU and memory devices have to be
+processed. Therefore, activate this rule (which has the purpose
+to support real hotplug rather than coldplug) late in the boot
+sequence.
+---
+ CMakeLists.txt     | 2 +-
+ init/kdump.service | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f16f532..03eb133 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -206,7 +206,7 @@ ADD_CUSTOM_TARGET(
+ INSTALL(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/70-kdump.rules
+     DESTINATION
+-        /etc/udev/rules.d
++        /usr/lib/kdump
+ )
+ 
+ #
+diff --git a/init/kdump.service b/init/kdump.service
+index 997805f..fb19f84 100644
+--- a/init/kdump.service
++++ b/init/kdump.service
+@@ -5,6 +5,8 @@ After=local-fs.target network.service YaST2-Second-Stage.service YaST2-Firstboot
+ [Service]
+ Type=oneshot
+ ExecStart=/lib/kdump/load.sh --update
++ExecStartPost=-/usr/bin/cp /usr/lib/kdump/70-kdump.rules /run/udev/rules.d/70-kdump.rules
++ExecStopPost=-/usr/bin/rm -f /run/udev/rules.d/70-kdump.rules
+ ExecStop=/lib/kdump/unload.sh
+ RemainAfterExit=true
+ 
+-- 
+2.25.0
+

kdump.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 27 16:35:50 UTC 2020 - Martin Wilck <mwilck@suse.com>
+
+- kdump-activate-udev-rules-late-during-boot.patch: Activate
+  kdump udev rules late during boot (bsc#1154837)
+
 -------------------------------------------------------------------
 Tue Dec 17 10:00:30 UTC 2019 - Petr Tesařík <ptesarik@suse.com>
 

kdump.spec

@@ -27,16 +27,6 @@
 
 %define dracutlibdir %{_prefix}/lib/dracut
 
-%{!?_udevdir: %global _udevdir %(pkg-config --variable=udevdir udev)}
-%if "%{_udevdir}" == ""
-%if 0%{?suse_version} >= 1230
-%global _udevdir %{_prefix}/lib/udev
-%else
-%global _udevdir /lib/udev
-%endif
-%endif
-%define _udevrulesdir %{_udevdir}/rules.d
-
 Name:           kdump
 Version:        0.9.0
 Release:        0
@@ -76,6 +66,7 @@ Patch27:        %{name}-Document-fence_kdump_send.patch
 Patch28:        %{name}-powerpc-no-reload-on-CPU-removal.patch
 Patch29:        %{name}-prefer-by-path-and-device-mapper.patch
 Patch30:        %{name}-calibrate-Update-values.patch
+Patch31:        %{name}-activate-udev-rules-late-during-boot.patch
 BuildRequires:  asciidoc
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -164,6 +155,7 @@ after a crash dump has occured.
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 %build
 export CFLAGS="%{optflags}"
@@ -179,9 +171,6 @@ ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags}
 
 %install
 DESTDIR=%{buildroot} make -C build %{?_smp_mflags} install
-# move udev rules
-mkdir -p %{buildroot}/%{_udevrulesdir}
-mv %{buildroot}/%{_sysconfdir}/udev/rules.d/* %{buildroot}/%{_udevrulesdir}/
 # remove executable bit from non-binaries
 chmod -x %{buildroot}/lib/kdump/setup-kdump.functions
 # empty directory
@@ -280,7 +269,8 @@ rm %{_localstatedir}/log/dump >/dev/null 2>&1 || true
 %{dracutlibdir}/modules.d/99kdump/
 %dir /lib/kdump
 /lib/kdump/*
-%{_udevrulesdir}/70-kdump.rules
+%dir /usr/lib/kdump
+/usr/lib/kdump/70-kdump.rules
 %if %{systemd_present}
 %{_unitdir}/kdump.service
 %{_unitdir}/kdump-early.service