anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0654-rpm-remove-confusing-user-before-global.patch

aed857
From 4bc18a925e964f10b4e7ed92e8e0d84bf985c6a8 Mon Sep 17 00:00:00 2001
aed857
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
aed857
Date: Sat, 19 May 2018 13:01:55 +0200
aed857
Subject: [PATCH] rpm: remove confusing --user before --global
aed857
aed857
Fixes #9027.
aed857
aed857
(cherry picked from commit 28d36da64a7a23a55e8d0a139f2620384fd058b3)
aed857
Resolves: #1582383
aed857
---
aed857
 src/core/macros.systemd.in | 4 ++--
aed857
 1 file changed, 2 insertions(+), 2 deletions(-)
aed857
aed857
diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
c62b8e
index 662791cccc..3d6e412744 100644
aed857
--- a/src/core/macros.systemd.in
aed857
+++ b/src/core/macros.systemd.in
aed857
@@ -43,7 +43,7 @@ if [ $1 -eq 1 ] ; then \
aed857
 fi \
aed857
 %{nil}
aed857
 
aed857
-%systemd_user_post() %{expand:%systemd_post \\--user \\--global %%{?*}}
aed857
+%systemd_user_post() %{expand:%systemd_post \\--global %%{?*}}
aed857
 
aed857
 %systemd_preun() \
aed857
 if [ $1 -eq 0 ] ; then \
aed857
@@ -56,7 +56,7 @@ fi \
aed857
 %systemd_user_preun() \
aed857
 if [ $1 -eq 0 ] ; then \
aed857
         # Package removal, not upgrade \
aed857
-        systemctl --no-reload --user --global disable %{?*} > /dev/null 2>&1 || : \
aed857
+        systemctl --global disable %{?*} > /dev/null 2>&1 || : \
aed857
 fi \
aed857
 %{nil}
aed857