daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1abbee
From 195083a33b4204d513787e7f4b6c63f19a0fe1c7 Mon Sep 17 00:00:00 2001
1abbee
From: Lukas Nykryn <lnykryn@redhat.com>
1abbee
Date: Tue, 13 Sep 2016 13:18:38 +0200
1abbee
Subject: [PATCH] 40-redhat.rules: don't hoplug memory on s390x
1abbee
1abbee
Resolves: #1370161
1abbee
---
1abbee
 rules/40-redhat.rules | 2 +-
1abbee
 1 file changed, 1 insertion(+), 1 deletion(-)
1abbee
1abbee
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
c62b8e
index 3335fe5075..4c56950dab 100644
1abbee
--- a/rules/40-redhat.rules
1abbee
+++ b/rules/40-redhat.rules
1abbee
@@ -4,7 +4,7 @@
1abbee
 SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
1abbee
 
1abbee
 # Memory hotadd request
1abbee
-SUBSYSTEM=="memory", ACTION=="add", ATTR{state}=="offline", ATTR{state}="online"
1abbee
+SUBSYSTEM=="memory", ACTION=="add", PROGRAM="/usr/bin/systemd-detect-virt", RESULT!="zvm", ATTR{state}=="offline", ATTR{state}="online"
1abbee
 
1abbee
 # reload sysctl.conf / sysctl.conf.d settings when the bridge module is loaded
1abbee
 ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="/usr/lib/systemd/systemd-sysctl --prefix=/proc/sys/net/bridge"