- move try-restart to %systemd_post
- drop %systemd_postun macro
Changed files:
rpm-build-macros.spec -> 1.306
rpm.macros -> 1.626
-%define rpm_macros_rev 1.625
+%define rpm_macros_rev 1.626
%define find_lang_rev 1.35
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
%define find_lang_rev 1.35
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
# Author: Bartlomiej Zimon <uzi18@o2.pl>
#
# Usage:
# Author: Bartlomiej Zimon <uzi18@o2.pl>
#
# Usage:
-# %systemd_post
-# %systemd_enable service_name.service
-# %systemd_preun service_name.service
-# %systemd_postun service_name.service
+# %systemd_reload
+# %systemd_post service_name1.service service_name2.service
+# %systemd_preun service_name1.service service_name2.service
#
# Sample:
# %post systemd
#
# Sample:
# %post systemd
# or if service must be enabled by default:
# %post systemd
# or if service must be enabled by default:
# %post systemd
-# %systemd_post
-# %systemd_enable %{name}
+# %systemd_post %{name}.service
-# %systemd_preun %{name}
+# %systemd_preun %{name}.service
-# %systemd_postun %{name}
-# BuildRequires: rpmbuild(macros) >= 1.625
+# BuildRequires: rpmbuild(macros) >= 1.626
# Requires: systemd-units >= 37-0.10
# Requires: systemd-units >= 37-0.10
-%systemd_enable() \
- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog; \
- if [ $1 -eq 1 ]; then \
- /bin/systemctl --quiet enable %1 || : \
- fi
+%systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || :
- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog; \
- if [ $1 -eq 1 ] && /bin/systemd_booted; then \
- /bin/systemctl --quiet daemon-reload || : \
- fi
+ export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+ /bin/systemd_booted && /bin/systemctl --quiet daemon-reload || : \
+ if [ $1 -eq 1 ]; then \
+ /bin/systemctl --quiet enable %{*} || : \
+ fi \
+ if [ $1 -gt 1 ]; then \
+ /bin/systemctl --quiet try-restart %{*} || : \
+ fi \
- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog; \
- /bin/systemctl --no-reload --quiet disable %1 || : \
+ export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog; \
+ /bin/systemctl --no-reaload --quiet disable %{*} || : \
if /bin/systemd_booted; then \
if /bin/systemd_booted; then \
- /bin/systemctl --quiet stop %1 || : \
- fi \
- fi
-
-%systemd_postun() \
- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog; \
- if /bin/systemd_booted; then \
- /bin/systemctl --quiet daemon-reload || : \
- if [ $1 -ge 1 ]; then \
- /bin/systemctl --quiet try-restart %1 || : \
+ /bin/systemctl --quiet stop %{*} || : \