daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
a19bc6
From 2cd738ce220e0dd11d3b19cf593e159a7e31ddc4 Mon Sep 17 00:00:00 2001
c79076
From: Michal Sekletar <msekleta@redhat.com>
c79076
Date: Fri, 16 Sep 2016 14:45:01 +0200
c79076
Subject: [PATCH] 40-redhat.rules: disable auto-online of hot-plugged memory on
c79076
 IBM z Systems
c79076
a19bc6
Related: #1375603
c79076
---
c79076
 rules/40-redhat.rules | 2 +-
c79076
 1 file changed, 1 insertion(+), 1 deletion(-)
c79076
c79076
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
c62b8e
index 4c56950dab..0164dc9214 100644
c79076
--- a/rules/40-redhat.rules
c79076
+++ b/rules/40-redhat.rules
c79076
@@ -4,7 +4,7 @@
c79076
 SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
c79076
 
c79076
 # Memory hotadd request
c79076
-SUBSYSTEM=="memory", ACTION=="add", PROGRAM="/usr/bin/systemd-detect-virt", RESULT!="zvm", ATTR{state}=="offline", ATTR{state}="online"
c79076
+SUBSYSTEM=="memory", ACTION=="add", PROGRAM="/bin/uname -p", RESULT!="s390*", ATTR{state}=="offline", ATTR{state}="online"
c79076
 
c79076
 # reload sysctl.conf / sysctl.conf.d settings when the bridge module is loaded
c79076
 ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="/usr/lib/systemd/systemd-sysctl --prefix=/proc/sys/net/bridge"