anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

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

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