naccyde / rpms / systemd

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