daandemeyer / rpms / systemd

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