From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 19 May 2018 11:01:55 +0000 (+0200)
Subject: rpm: remove confusing --user before --global
X-Git-Tag: v239~230^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28d36da64a7a23a55e8d0a139f2620384fd058b3;p=thirdparty%2Fsystemd.git

rpm: remove confusing --user before --global

Fixes #9027.
---

diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
index 89fc68ceb3d..660775f17a8 100644
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@ -42,7 +42,7 @@ if [ $1 -eq 1 ] ; then \
 fi \
 %{nil}
 
-%systemd_user_post() %{expand:%systemd_post \\--user \\--global %%{?*}}
+%systemd_user_post() %{expand:%systemd_post \\--global %%{?*}}
 
 %systemd_preun() \
 if [ $1 -eq 0 ] ; then \
@@ -54,7 +54,7 @@ fi \
 %systemd_user_preun() \
 if [ $1 -eq 0 ] ; then \
         # Package removal, not upgrade \
-        systemctl --no-reload --user --global disable %{?*} > /dev/null 2>&1 || : \
+        systemctl --global disable %{?*} > /dev/null 2>&1 || : \
 fi \
 %{nil}