Accepting request 180591 from home:sumski:branches:home:rwooninck:UNSTABLE_KDE4
Remove the override that was added in solving bnc#802525, as it causes similar situation when upgrading dbus and systemd simultaneously. also adjusted rc.boot.dbus script so it uses /run instead of /var/run OBS-URL: https://build.opensuse.org/request/show/180591 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=120
This commit is contained in:
parent
2d7c38919d
commit
ac58f2f544
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 22 18:27:19 UTC 2013 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Remove the override that was added in solving bnc#802525, as it
|
||||
causes similar situation when upgrading dbus and systemd
|
||||
simultaneously.
|
||||
- Adjusted rc.boot.dbus script so it uses /run instead of /var/run
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 25 21:02:26 UTC 2013 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 22 18:27:19 UTC 2013 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Remove the override that was added in solving bnc#802525, as it
|
||||
causes similar situation when upgrading dbus and systemd
|
||||
simultaneously.
|
||||
- Adjusted rc.boot.dbus script so it uses /run instead of /var/run
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 25 21:02:26 UTC 2013 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
@ -224,9 +224,6 @@ ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
|
||||
%{stop_on_removal dbus}
|
||||
|
||||
%post
|
||||
# Temporarily override the socket path systemd sees, so the running D-Bus process won't be clobbered.
|
||||
mkdir -p /run/systemd/system
|
||||
/usr/bin/sed 's#ListenStream=/run/dbus/system_bus_socket#ListenStream=/var/run/dbus/system_bus_socket#' < /usr/lib/systemd/system/dbus.socket > /run/systemd/system/dbus.socket
|
||||
|
||||
/bin/dbus-uuidgen --ensure
|
||||
%{insserv_force_if_yast dbus}
|
||||
|
@ -22,7 +22,7 @@ DBUS_DAEMON_BIN=/bin/dbus-daemon
|
||||
test -x $DBUS_DAEMON_BIN || exit 5
|
||||
|
||||
DBUS_DAEMON_PARAMETER="--system";
|
||||
DBUS_DAEMON_PID_DIR="/var/run/dbus"
|
||||
DBUS_DAEMON_PID_DIR="/run/dbus"
|
||||
DBUS_DAEMON_PID=$DBUS_DAEMON_PID_DIR/pid
|
||||
|
||||
DBUS_MACHINE_ID_DIR="/var/lib/dbus"
|
||||
|
Loading…
Reference in New Issue
Block a user