From f0c8ea9afc7331a54603b17ad912921f45cbc06447c6caca75c1ab0400639eea Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Thu, 20 May 2021 09:47:35 +0000
Subject: [PATCH] - %sysusers_create_inline: use here-docs instead of echo
 (bsc#1186282)   Upstream commit dd2490ae12ad1e1795ecbf8f8944b950da9c8d06.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=66
---
 macros.systemd             | 6 +++---
 systemd-rpm-macros.changes | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/macros.systemd b/macros.systemd
index 7a4bfb9..d9e02a2 100644
--- a/macros.systemd
+++ b/macros.systemd
@@ -226,9 +226,9 @@ fi											\
 %{nil}
 
 %sysusers_create_inline() \
-if [ -x /usr/bin/systemd-sysusers ]; then \
-	echo %{?*} | systemd-sysusers - || : \
-fi \
+[ -x /usr/bin/systemd-sysusers ] && /usr/bin/systemd-sysusers - <<SYSTEMD_INLINE_EOF || : \
+%{?*} \
+SYSTEMD_INLINE_EOF\
 %{nil}
 
 %sysctl_apply() \
diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes
index a4fb85c..bab9422 100644
--- a/systemd-rpm-macros.changes
+++ b/systemd-rpm-macros.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 20 09:45:11 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- %sysusers_create_inline: use here-docs instead of echo (bsc#1186282)
+
+  Upstream commit dd2490ae12ad1e1795ecbf8f8944b950da9c8d06.
+
 -------------------------------------------------------------------
 Fri Mar  5 12:27:14 UTC 2021 - Franck Bui <fbui@suse.com>