From 4f9d0e3630b77adea1435bd5258056d785967f67 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 25 Feb 2013 23:20:53 +0100 Subject: [PATCH] Revert "xbps-triggers: systemd-service: use --root option." This reverts commit 14648e55074096f2ad42ef1750cb4d5d2ab85d15. --- srcpkgs/xbps-triggers/files/systemd-service | 16 ++++++++-------- srcpkgs/xbps-triggers/template | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/xbps-triggers/files/systemd-service b/srcpkgs/xbps-triggers/files/systemd-service index 86760593522..45d584e8cc6 100755 --- a/srcpkgs/xbps-triggers/files/systemd-service +++ b/srcpkgs/xbps-triggers/files/systemd-service @@ -58,13 +58,13 @@ run) # package is being removed. # stop and disable the unit. echo "Stopping systemd service ${_srv}..." - systemctl --root=. stop ${_srv} >/dev/null 2>&1 || : + systemctl stop ${_srv} >/dev/null 2>&1 || : echo "Disabling systemd service ${_srv}..." - systemctl --root=. --no-reload disable ${_srv} >/dev/null 2>&1 || : + systemctl --no-reload disable ${_srv} >/dev/null 2>&1 || : else # Package update, just disable the unit. echo "Disabling systemd service ${_srv}..." - systemctl --root=. --no-reload disable ${_srv} >/dev/null 2>&1 || : + systemctl --no-reload disable ${_srv} >/dev/null 2>&1 || : fi else @@ -72,10 +72,10 @@ run) # package is being installed. # enable (but don't start) the unit by default. echo "Enabling systemd service ${_srv}..." - systemctl --root=. enable ${_srv} >/dev/null 2>&1 || : + systemctl enable ${_srv} >/dev/null 2>&1 || : if [ -n "$systemd_booted" ]; then # reload systemd if running. - systemctl --root=. daemon-reload >/dev/null 2>&1 || : + systemctl daemon-reload >/dev/null 2>&1 || : fi cat <<_EOF ========================================================================== @@ -96,16 +96,16 @@ Refer to the systemd documentation if more information is required. _EOF else # Enable the unit in case it wasn't added. - systemctl --root=. enable ${_srv} >/dev/null 2>&1 || : + systemctl enable ${_srv} >/dev/null 2>&1 || : # package is being updated. if [ -n "$system_booted" ]; then # reload systemd if running. - systemctl --root=. daemon-reload >/dev/null 2>&1 || : + systemctl daemon-reload >/dev/null 2>&1 || : fi if [ -n "$restart" ]; then # try restarting package service. - systemctl --root=. try-restart ${_srv} >/dev/null 2>&1 || : + systemctl try-restart ${_srv} >/dev/null 2>&1 || : else echo "systemd ${_srv} service must be restarted manually!" fi diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index 3b89c01cbe5..22ddbe9d6ba 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -1,6 +1,6 @@ # Template file for 'xbps-triggers' pkgname=xbps-triggers -version=0.60 +version=0.59 revision=1 short_desc="The XBPS triggers for Void Linux" maintainer="Juan RP "