You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
49 lines
1.7 KiB
49 lines
1.7 KiB
From f8747430762d9daad14f71cdd7ee98daf833e161 Mon Sep 17 00:00:00 2001 |
|
From: Lukas Nykryn <lnykryn@redhat.com> |
|
Date: Tue, 27 Jun 2017 09:21:19 +0200 |
|
Subject: [PATCH] Revert "rules: move cpu hotplug rule to separate file" |
|
|
|
This reverts commit 360d7eb0f8233d16557ef34a9e58055a67ea9b70. |
|
Resolves: #1465108 |
|
--- |
|
Makefile.am | 1 - |
|
rules/40-redhat-cpu-hotplug.rules | 4 ---- |
|
rules/40-redhat.rules | 3 +++ |
|
3 files changed, 3 insertions(+), 5 deletions(-) |
|
delete mode 100644 rules/40-redhat-cpu-hotplug.rules |
|
|
|
diff --git a/Makefile.am b/Makefile.am |
|
index 94fee02c57..e9ceac98a4 100644 |
|
--- a/Makefile.am |
|
+++ b/Makefile.am |
|
@@ -3511,7 +3511,6 @@ dist_udevrules_DATA += \ |
|
rules/80-net-setup-link.rules \ |
|
rules/95-udev-late.rules \ |
|
rules/40-redhat.rules \ |
|
- rules/40-redhat-cpu-hotplug.rules \ |
|
rules/73-idrac.rules \ |
|
rules/80-net-name-slot.rules |
|
|
|
diff --git a/rules/40-redhat-cpu-hotplug.rules b/rules/40-redhat-cpu-hotplug.rules |
|
deleted file mode 100644 |
|
index bc5ddc8416..0000000000 |
|
--- a/rules/40-redhat-cpu-hotplug.rules |
|
+++ /dev/null |
|
@@ -1,4 +0,0 @@ |
|
-# do not edit this file, it will be overwritten on update |
|
- |
|
-# CPU hotadd request |
|
-SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1" |
|
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules |
|
index d04c7fc9a2..34a1df9c48 100644 |
|
--- a/rules/40-redhat.rules |
|
+++ b/rules/40-redhat.rules |
|
@@ -1,5 +1,8 @@ |
|
# do not edit this file, it will be overwritten on update |
|
|
|
+# CPU hotadd request |
|
+SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1" |
|
+ |
|
# Memory hotadd request |
|
SUBSYSTEM=="memory", ACTION=="add", PROGRAM="/bin/uname -p", RESULT!="s390*", ATTR{state}=="offline", ATTR{state}="online" |
|
|
|
|