From dd62fc47a008979445361b0c38616d20b6898051 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 04 2019 15:42:18 +0000
Subject: import systemd-219-62.el7_6.7


---

diff --git a/SOURCES/0674-rules-fix-memory-hotplug-rule-so-systemd-detect-virt.patch b/SOURCES/0674-rules-fix-memory-hotplug-rule-so-systemd-detect-virt.patch
new file mode 100644
index 0000000..dd280fd
--- /dev/null
+++ b/SOURCES/0674-rules-fix-memory-hotplug-rule-so-systemd-detect-virt.patch
@@ -0,0 +1,27 @@
+From 8ed83533ae34ad1836fa82f70c08eb075aa8578f Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Wed, 30 Jan 2019 10:20:57 +0100
+Subject: [PATCH] rules: fix memory hotplug rule so systemd-detect-virt does
+ not run too often
+
+Fixes a bug introduced in commit c50b7bcbebcfebfce3a7e7fb77f88f4b590fb2b5.
+
+Resolves: #1701230
+---
+ rules/40-redhat.rules | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
+index 1b10e173d..2c690e522 100644
+--- a/rules/40-redhat.rules
++++ b/rules/40-redhat.rules
+@@ -4,7 +4,8 @@
+ SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
+ 
+ # Memory hotadd request
+-SUBSYSTEM!="memory", ACTION!="add", GOTO="memory_hotplug_end"
++SUBSYSTEM!="memory", GOTO="memory_hotplug_end"
++ACTION!="add", GOTO="memory_hotplug_end"
+ PROGRAM="/bin/uname -p", RESULT=="s390*", GOTO="memory_hotplug_end"
+ 
+ ENV{.state}="online"
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 1746f92..844dc49 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -7,7 +7,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        219
-Release:        62%{?dist}.6
+Release:        62%{?dist}.7
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -712,6 +712,7 @@ Patch0670: 0670-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
 Patch0671: 0671-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
 Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
 Patch0673: 0673-Revert-bus-when-dumping-string-property-values-escap.patch
+Patch0674: 0674-rules-fix-memory-hotplug-rule-so-systemd-detect-virt.patch
 
 %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
 
@@ -1688,6 +1689,9 @@ fi
 %{_mandir}/man8/systemd-resolved.*
 
 %changelog
+* Wed Apr 24 2019 Lukas Nykryn <lnykryn@redhat.com> - 219-62.7
+- rules: fix memory hotplug rule so systemd-detect-virt does not run too often (#1701230)
+
 * Thu Mar 21 2019 Lukas Nykryn <lnykryn@redhat.com> - 219-62.6
 - Revert "bus: when dumping string property values escape the chars we use as end-of-line and end-of-item marks" (#1643172)