ryantimwilson / rpms / systemd

Forked from rpms/systemd a month ago
Clone
923a60
From f8747430762d9daad14f71cdd7ee98daf833e161 Mon Sep 17 00:00:00 2001
923a60
From: Lukas Nykryn <lnykryn@redhat.com>
923a60
Date: Tue, 27 Jun 2017 09:21:19 +0200
923a60
Subject: [PATCH] Revert "rules: move cpu hotplug rule to separate file"
923a60
923a60
This reverts commit 360d7eb0f8233d16557ef34a9e58055a67ea9b70.
923a60
Resolves: #1465108
923a60
---
923a60
 Makefile.am                       | 1 -
923a60
 rules/40-redhat-cpu-hotplug.rules | 4 ----
923a60
 rules/40-redhat.rules             | 3 +++
923a60
 3 files changed, 3 insertions(+), 5 deletions(-)
923a60
 delete mode 100644 rules/40-redhat-cpu-hotplug.rules
923a60
923a60
diff --git a/Makefile.am b/Makefile.am
923a60
index 94fee02c57..e9ceac98a4 100644
923a60
--- a/Makefile.am
923a60
+++ b/Makefile.am
923a60
@@ -3511,7 +3511,6 @@ 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
deleted file mode 100644
923a60
index bc5ddc8416..0000000000
923a60
--- a/rules/40-redhat-cpu-hotplug.rules
923a60
+++ /dev/null
923a60
@@ -1,4 +0,0 @@
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 d04c7fc9a2..34a1df9c48 100644
923a60
--- a/rules/40-redhat.rules
923a60
+++ b/rules/40-redhat.rules
923a60
@@ -1,5 +1,8 @@
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