Hello community,
here is the log from the commit of package systemd-rpm-macros for
openSUSE:Factory checked in at 2015-11-26 17:00:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd-rpm-macros"
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2015-10-14 16:34:30.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes
2015-11-26 17:00:41.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 20 16:53:23 UTC 2015 - wer...@suse.de
+
+- Support of DISABLE_STOP_ON_REMOVAL and DISABLE_RESTART_ON_UPDATE
+ from /etc/sysconfig/service (bsc#955996)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ macros.systemd ++++++
--- /var/tmp/diff_new_pack.29tFpy/_old 2015-11-26 17:00:42.000000000 +0100
+++ /var/tmp/diff_new_pack.29tFpy/_new 2015-11-26 17:00:42.000000000 +0100
@@ -50,13 +50,25 @@
%_ntpunitsdir /usr/lib/systemd/ntp-units.d
%_binfmtdir /usr/lib/binfmt.d
+%_restart_check_systemctl
\
+ test -f /etc/sysconfig/services && . /etc/sysconfig/services
\
+ test "$YAST_IS_RUNNING" = instsys && exit 0
\
+ test "$DISABLE_RESTART_ON_UPDATE" = yes && exit 0
\
+ /usr/bin/systemctl try-restart %{nil}
+
+%_stop_check_systemctl
\
+ test -f /etc/sysconfig/services && . /etc/sysconfig/services
\
+ test "$YAST_IS_RUNNING" = instsys && exit 0
\
+ test "$DISABLE_STOP_ON_REMOVAL" = yes && exit 0
\
+ /usr/bin/systemctl stop %{nil}
+
%service_add_pre()
\
test -n "$FIRST_ARG" || FIRST_ARG="$1"
\
# disable migration if initial install under systemd
\
[ -d /var/lib/systemd/migrated ] || mkdir -p /var/lib/systemd/migrated || :
\
if [ "$FIRST_ARG" -eq 1 ]; then
\
for service in %{?*} ; do
\
- sysv_service="${service%.*}"
\
+ sysv_service="${service%%.*}"
\
touch "/var/lib/systemd/migrated/$sysv_service" || :
\
done
\
else
\
@@ -68,7 +80,7 @@
done
\
fi
\
for service in %{?*} ; do
\
- sysv_service="${service%.*}"
\
+ sysv_service="${service%%.*}"
\
if [ ! -e "/var/lib/systemd/migrated/$sysv_service" ]; then
\
services_to_migrate="$services_to_migrate
$sysv_service" \
fi
\
@@ -84,7 +96,7 @@
test -n "$FIRST_ARG" || FIRST_ARG="$1"
\
[ -d /var/lib/systemd/migrated ] || mkdir -p /var/lib/systemd/migrated || :
\
for service in %{?*} ; do
\
- sysv_service="${service%.*}"
\
+ sysv_service="${service%%.*}"
\
if [ ! -e "/var/lib/systemd/migrated/$sysv_service" ]; then
\
services_to_migrate="$services_to_migrate $sysv_service"
\
touch "/var/lib/systemd/migrated/$sysv_service" || :
\
@@ -121,7 +133,7 @@
if [ "$FIRST_ARG" -eq 0 -a -x /usr/bin/systemctl ]; then
\
# Package removal, not upgrade
\
/usr/bin/systemctl --no-reload disable %{?*} || :
\
- /usr/bin/systemctl stop %{?*} || :
\
+ ( %_stop_check_systemctl %{?*} || : )
\
fi
\
%{nil}
@@ -130,10 +142,9 @@
test -n "$FIRST_ARG" || FIRST_ARG="$1"
\
if [ "$FIRST_ARG" -ge 1 ]; then
\
# Package upgrade, not uninstall
\
- if test "$YAST_IS_RUNNING" != "instsys" &&
\
- test "$DISABLE_RESTART_ON_UPDATE" != yes -a -x /usr/bin/systemctl;
then \
+ if [ -x /usr/bin/systemctl ]; then
\
/usr/bin/systemctl daemon-reload || :
\
- /usr/bin/systemctl try-restart %{?*} || :
\
+ ( %_restart_check_systemctl %{?*} || : )
\
fi
\
else # package uninstall
\
for service in %{?*} ; do
\
@@ -150,7 +161,7 @@
if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then
\
# Package removal, not upgrade
\
/usr/bin/systemctl --no-reload disable %{?*} || :
\
- /usr/bin/systemctl stop %{?*} || :
\
+ ( %_stop_check_systemctl %{?*} || : )
\
fi
\
%{nil}
@@ -160,7 +171,7 @@
if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then
\
# Package removal, not upgrade
\
/usr/bin/systemctl --no-reload disable %{?*} || :
\
- /usr/bin/systemctl stop %{?*} || :
\
+ ( %_stop_check_systemctl %{?*} || : )
\
fi
\
%{nil}
