|
 |
803fb7 |
From f8747430762d9daad14f71cdd7ee98daf833e161 Mon Sep 17 00:00:00 2001
|
|
|
803fb7 |
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
|
803fb7 |
Date: Tue, 27 Jun 2017 09:21:19 +0200
|
|
|
803fb7 |
Subject: [PATCH] Revert "rules: move cpu hotplug rule to separate file"
|
|
|
803fb7 |
|
|
|
803fb7 |
This reverts commit 360d7eb0f8233d16557ef34a9e58055a67ea9b70.
|
|
|
803fb7 |
Resolves: #1465108
|
|
|
803fb7 |
---
|
|
|
803fb7 |
Makefile.am | 1 -
|
|
|
803fb7 |
rules/40-redhat-cpu-hotplug.rules | 4 ----
|
|
|
803fb7 |
rules/40-redhat.rules | 3 +++
|
|
|
803fb7 |
3 files changed, 3 insertions(+), 5 deletions(-)
|
|
|
803fb7 |
delete mode 100644 rules/40-redhat-cpu-hotplug.rules
|
|
|
803fb7 |
|
|
|
803fb7 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
803fb7 |
index 94fee02c5..e9ceac98a 100644
|
|
|
803fb7 |
--- a/Makefile.am
|
|
|
803fb7 |
+++ b/Makefile.am
|
|
|
803fb7 |
@@ -3511,7 +3511,6 @@ dist_udevrules_DATA += \
|
|
|
803fb7 |
rules/80-net-setup-link.rules \
|
|
|
803fb7 |
rules/95-udev-late.rules \
|
|
|
803fb7 |
rules/40-redhat.rules \
|
|
|
803fb7 |
- rules/40-redhat-cpu-hotplug.rules \
|
|
|
803fb7 |
rules/73-idrac.rules \
|
|
|
803fb7 |
rules/80-net-name-slot.rules
|
|
|
803fb7 |
|
|
|
803fb7 |
diff --git a/rules/40-redhat-cpu-hotplug.rules b/rules/40-redhat-cpu-hotplug.rules
|
|
|
803fb7 |
deleted file mode 100644
|
|
|
803fb7 |
index bc5ddc841..000000000
|
|
|
803fb7 |
--- a/rules/40-redhat-cpu-hotplug.rules
|
|
|
803fb7 |
+++ /dev/null
|
|
|
803fb7 |
@@ -1,4 +0,0 @@
|
|
|
803fb7 |
-# do not edit this file, it will be overwritten on update
|
|
|
803fb7 |
-
|
|
|
803fb7 |
-# CPU hotadd request
|
|
|
803fb7 |
-SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
|
|
|
803fb7 |
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
|
|
|
803fb7 |
index d04c7fc9a..34a1df9c4 100644
|
|
|
803fb7 |
--- a/rules/40-redhat.rules
|
|
|
803fb7 |
+++ b/rules/40-redhat.rules
|
|
|
803fb7 |
@@ -1,5 +1,8 @@
|
|
|
803fb7 |
# do not edit this file, it will be overwritten on update
|
|
|
803fb7 |
|
|
|
803fb7 |
+# CPU hotadd request
|
|
|
803fb7 |
+SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
|
|
|
803fb7 |
+
|
|
|
803fb7 |
# Memory hotadd request
|
|
|
803fb7 |
SUBSYSTEM=="memory", ACTION=="add", PROGRAM="/bin/uname -p", RESULT!="s390*", ATTR{state}=="offline", ATTR{state}="online"
|
|
|
803fb7 |
|