daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
923a60
From 360d7eb0f8233d16557ef34a9e58055a67ea9b70 Mon Sep 17 00:00:00 2001
923a60
From: Michal Sekletar <msekleta@redhat.com>
923a60
Date: Mon, 12 Jun 2017 13:43:48 +0200
923a60
Subject: [PATCH] rules: move cpu hotplug rule to separate file
923a60
923a60
In kdump initrd we don't want to automatically bring online all
923a60
available CPUs. Hence, kdump maintainers can easily mask the rule by
923a60
placing symlink to /dev/null with the same name in /etc/udev/rules.d
923a60
923a60
RHEL-only
923a60
923a60
Related: #1266322
923a60
923a60
[msekleta: note that this is just part of the fix for #1266322, in
923a60
order to fix the bug it is necessary to actually mask the newly added
923a60
rule when generating kdump initrd]
923a60
---
923a60
 Makefile.am                       | 1 +
923a60
 rules/40-redhat-cpu-hotplug.rules | 4 ++++
923a60
 rules/40-redhat.rules             | 3 ---
923a60
 3 files changed, 5 insertions(+), 3 deletions(-)
923a60
 create mode 100644 rules/40-redhat-cpu-hotplug.rules
923a60
923a60
diff --git a/Makefile.am b/Makefile.am
923a60
index e9ceac98a4..94fee02c57 100644
923a60
--- a/Makefile.am
923a60
+++ b/Makefile.am
923a60
@@ -3511,6 +3511,7 @@ dist_udevrules_DATA += \
923a60
 	rules/80-net-setup-link.rules \
923a60
 	rules/95-udev-late.rules \
923a60
 	rules/40-redhat.rules \
923a60
+	rules/40-redhat-cpu-hotplug.rules \
923a60
 	rules/73-idrac.rules \
923a60
         rules/80-net-name-slot.rules
923a60
 
923a60
diff --git a/rules/40-redhat-cpu-hotplug.rules b/rules/40-redhat-cpu-hotplug.rules
923a60
new file mode 100644
923a60
index 0000000000..bc5ddc8416
923a60
--- /dev/null
923a60
+++ b/rules/40-redhat-cpu-hotplug.rules
923a60
@@ -0,0 +1,4 @@
923a60
+# do not edit this file, it will be overwritten on update
923a60
+
923a60
+# CPU hotadd request
923a60
+SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
923a60
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
923a60
index 34a1df9c48..d04c7fc9a2 100644
923a60
--- a/rules/40-redhat.rules
923a60
+++ b/rules/40-redhat.rules
923a60
@@ -1,8 +1,5 @@
923a60
 # do not edit this file, it will be overwritten on update
923a60
 
923a60
-# CPU hotadd request
923a60
-SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
923a60
-
923a60
 # Memory hotadd request
923a60
 SUBSYSTEM=="memory", ACTION=="add", PROGRAM="/bin/uname -p", RESULT!="s390*", ATTR{state}=="offline", ATTR{state}="online"
923a60