richardphibel / rpms / systemd

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