Accepting request 706332 from home:simotek:branches:Base:System
Also remove %post_trans thats no longer needed OBS-URL: https://build.opensuse.org/request/show/706332 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=283
This commit is contained in:
parent
69849756b4
commit
7b48e6ed74
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 29 13:25:43 UTC 2019 - Simon Lees <sflees@suse.de>
|
||||
|
||||
- Replace DISABLE_RESTART_ON_UPDATE with
|
||||
%service_del_postun_without_restart
|
||||
- Remove version specific code to block all updates on restart as
|
||||
hopefully no tumbleweed versions still have code causing those
|
||||
issues (was only present for a few snapshots)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 24 09:27:11 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
|
31
dbus-1.spec
31
dbus-1.spec
@ -210,33 +210,6 @@ getent passwd messagebus >/dev/null || \
|
||||
%{_sbindir}/useradd -r -s %{_bindir}/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus
|
||||
%service_add_pre dbus.service dbus.socket
|
||||
|
||||
# Lines below are temporary code to disable service restart on update sflees@suse.de boo#1020301
|
||||
# These are potentially not needed on non tumbleweed systems where updates while running a desktop are not supported.
|
||||
# This seems likely to only effect the last version of tumbleweed where the service files were added and can probably be
|
||||
# removed reletavly soon.
|
||||
|
||||
# Get the current version
|
||||
if [ $1 -gt 1 ]; then
|
||||
CURRENT_VER=$(%{_bindir}/dbus-daemon --version 2>/dev/null| sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' | head -1)
|
||||
|
||||
# If the current version is or less then 1.10.2 where this change was added then migration needs to be run
|
||||
# The following line will return 1.10.2 if its newer then the current version
|
||||
TEST_VER=$(printf "1.10.2\n$CURRENT_VER" | sort -Vr | head -1)
|
||||
|
||||
if [ "$TEST_VER" = "1.10.12" ]; then
|
||||
if [ -f %{_sysconfdir}/sysconfig/services ]; then
|
||||
cp -a %{_sysconfdir}/sysconfig/services %{_backup}
|
||||
else
|
||||
touch %{_backup}
|
||||
fi
|
||||
cat >>%{_sysconfdir}/sysconfig/services <<EOF
|
||||
# temporarily added by rpm update to avoid dbus service restart
|
||||
# backup saved in %{_backup}
|
||||
DISABLE_RESTART_ON_UPDATE="yes"
|
||||
EOF
|
||||
fi
|
||||
fi
|
||||
|
||||
%post
|
||||
if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then
|
||||
cmp -s %{_localstatedir}/lib/dbus/machine-id %{_sysconfdir}/machine-id > /dev/null
|
||||
@ -262,9 +235,7 @@ fi
|
||||
%service_del_preun dbus.service dbus.socket
|
||||
|
||||
%postun
|
||||
# immediately restarting the dbus service causes issues, As such wait for the next reboot to restart
|
||||
export DISABLE_RESTART_ON_UPDATE=yes
|
||||
%service_del_postun dbus.service dbus.socket
|
||||
%service_del_postun_without_restart dbus.service dbus.socket
|
||||
|
||||
%posttrans
|
||||
# See comments in pre
|
||||
|
Loading…
Reference in New Issue
Block a user