rpm: avoid hiding errors from systemd commands
Humans are susceptible to making orthographic errors sometimes. A misspelled "%systemd_post caek.service" would go unnoticed due to all output from systemctl being discarded if and when %post runs. To alleviate this, cease hiding outputs. Then, to account for the potential absence of systemd from the system, add file checks so as to not generate a "command not found" error.
This commit is contained in:
+13
-13
@@ -45,9 +45,9 @@ OrderWithRequires(postun): systemd \
|
|||||||
|
|
||||||
%systemd_post() \
|
%systemd_post() \
|
||||||
%{expand:%%{?__systemd_someargs_%#}} \
|
%{expand:%%{?__systemd_someargs_%#}} \
|
||||||
if [ $1 -eq 1 ] ; then \
|
if [ $1 -eq 1 ] && [ -x @bindir@/systemctl ] ; then \
|
||||||
# Initial installation \
|
# Initial installation \
|
||||||
systemctl --no-reload preset %{?*} >/dev/null 2>&1 || : \
|
@bindir@/systemctl --no-reload preset %{?*} || : \
|
||||||
fi \
|
fi \
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
@@ -55,17 +55,17 @@ fi \
|
|||||||
|
|
||||||
%systemd_preun() \
|
%systemd_preun() \
|
||||||
%{expand:%%{?__systemd_someargs_%#}} \
|
%{expand:%%{?__systemd_someargs_%#}} \
|
||||||
if [ $1 -eq 0 ] ; then \
|
if [ $1 -eq 0 ] && [ -x @bindir@/systemctl ] ; then \
|
||||||
# Package removal, not upgrade \
|
# Package removal, not upgrade \
|
||||||
systemctl --no-reload disable --now %{?*} >/dev/null 2>&1 || : \
|
@bindir@/systemctl --no-reload disable --now %{?*} || : \
|
||||||
fi \
|
fi \
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
%systemd_user_preun() \
|
%systemd_user_preun() \
|
||||||
%{expand:%%{?__systemd_someargs_%#}} \
|
%{expand:%%{?__systemd_someargs_%#}} \
|
||||||
if [ $1 -eq 0 ] ; then \
|
if [ $1 -eq 0 ] && [ -x @bindir@/systemctl ] ; then \
|
||||||
# Package removal, not upgrade \
|
# Package removal, not upgrade \
|
||||||
systemctl --global disable %{?*} >/dev/null 2>&1 || : \
|
@bindir@/systemctl --global disable %{?*} || : \
|
||||||
fi \
|
fi \
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
@@ -75,9 +75,9 @@ fi \
|
|||||||
|
|
||||||
%systemd_postun_with_restart() \
|
%systemd_postun_with_restart() \
|
||||||
%{expand:%%{?__systemd_someargs_%#}} \
|
%{expand:%%{?__systemd_someargs_%#}} \
|
||||||
if [ $1 -ge 1 ] ; then \
|
if [ $1 -ge 1 ] && [ -x @bindir@/systemctl ] ; then \
|
||||||
# Package upgrade, not uninstall \
|
# Package upgrade, not uninstall \
|
||||||
systemctl try-restart %{?*} >/dev/null 2>&1 || : \
|
@bindir@/systemctl try-restart %{?*} || : \
|
||||||
fi \
|
fi \
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
@@ -92,17 +92,17 @@ fi \
|
|||||||
# Deprecated. Use %tmpfiles_create_package instead
|
# Deprecated. Use %tmpfiles_create_package instead
|
||||||
%tmpfiles_create() \
|
%tmpfiles_create() \
|
||||||
%{expand:%%{?__systemd_someargs_%#}} \
|
%{expand:%%{?__systemd_someargs_%#}} \
|
||||||
systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : \
|
[ -x @bindir@/systemd-tmpfiles ] && @bindir@/systemd-tmpfiles --create %{?*} || : \
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
# Deprecated. Use %sysusers_create_package instead
|
# Deprecated. Use %sysusers_create_package instead
|
||||||
%sysusers_create() \
|
%sysusers_create() \
|
||||||
%{expand:%%{?__systemd_someargs_%#}} \
|
%{expand:%%{?__systemd_someargs_%#}} \
|
||||||
systemd-sysusers %{?*} >/dev/null 2>&1 || : \
|
[ -x @bindir@/systemd-sysusers ] && @bindir@/systemd-sysusers %{?*} || : \
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
%sysusers_create_inline() \
|
%sysusers_create_inline() \
|
||||||
systemd-sysusers - <<SYSTEMD_INLINE_EOF >/dev/null 2>&1 || : \
|
[ -x @bindir@/systemd-sysusers ] && @bindir@/systemd-sysusers - <<SYSTEMD_INLINE_EOF || : \
|
||||||
%{?*} \
|
%{?*} \
|
||||||
SYSTEMD_INLINE_EOF \
|
SYSTEMD_INLINE_EOF \
|
||||||
%{nil}
|
%{nil}
|
||||||
@@ -149,10 +149,10 @@ SYSTEMD_INLINE_EOF \
|
|||||||
|
|
||||||
%sysctl_apply() \
|
%sysctl_apply() \
|
||||||
%{expand:%%{?__systemd_someargs_%#}} \
|
%{expand:%%{?__systemd_someargs_%#}} \
|
||||||
@rootlibexecdir@/systemd-sysctl %{?*} >/dev/null 2>&1 || : \
|
[ -x @rootlibexecdir@/systemd-sysctl ] && @rootlibexecdir@/systemd-sysctl %{?*} || : \
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
%binfmt_apply() \
|
%binfmt_apply() \
|
||||||
%{expand:%%{?__systemd_someargs_%#}} \
|
%{expand:%%{?__systemd_someargs_%#}} \
|
||||||
@rootlibexecdir@/systemd-binfmt %{?*} >/dev/null 2>&1 || : \
|
[ -x @rootlibexecdir@/systemd-binfmt ] && @rootlibexecdir@/systemd-binfmt %{?*} || : \
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|||||||
Reference in New Issue
Block a user