dryang / rpms / systemd

Forked from rpms/systemd a year ago
Clone
Pablo Greco 48fc63
From 82fb8420a53abded9d25502be8ab92d544b860a7 Mon Sep 17 00:00:00 2001
Pablo Greco 48fc63
From: Jan Synacek <jsynacek@redhat.com>
Pablo Greco 48fc63
Date: Wed, 30 Jan 2019 10:20:57 +0100
Pablo Greco 48fc63
Subject: [PATCH] rules: fix memory hotplug rule so systemd-detect-virt does
Pablo Greco 48fc63
 not run too often
Pablo Greco 48fc63
Pablo Greco 48fc63
Fixes a bug introduced in commit c50b7bcbebcfebfce3a7e7fb77f88f4b590fb2b5.
Pablo Greco 48fc63
Pablo Greco 48fc63
Resolves: #1666612
Pablo Greco 48fc63
---
Pablo Greco 48fc63
 rules/40-redhat.rules | 3 ++-
Pablo Greco 48fc63
 1 file changed, 2 insertions(+), 1 deletion(-)
Pablo Greco 48fc63
Pablo Greco 48fc63
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
Pablo Greco 48fc63
index 1b10e173d6..2c690e522e 100644
Pablo Greco 48fc63
--- a/rules/40-redhat.rules
Pablo Greco 48fc63
+++ b/rules/40-redhat.rules
Pablo Greco 48fc63
@@ -4,7 +4,8 @@
Pablo Greco 48fc63
 SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
Pablo Greco 48fc63
 
Pablo Greco 48fc63
 # Memory hotadd request
Pablo Greco 48fc63
-SUBSYSTEM!="memory", ACTION!="add", GOTO="memory_hotplug_end"
Pablo Greco 48fc63
+SUBSYSTEM!="memory", GOTO="memory_hotplug_end"
Pablo Greco 48fc63
+ACTION!="add", GOTO="memory_hotplug_end"
Pablo Greco 48fc63
 PROGRAM="/bin/uname -p", RESULT=="s390*", GOTO="memory_hotplug_end"
Pablo Greco 48fc63
 
Pablo Greco 48fc63
 ENV{.state}="online"