Bug 831626 - /var/lib/dbus/machine-id has different value than /etc/machine-id

OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=132
This commit is contained in:
Fridrich Strba 2013-10-07 08:21:05 +00:00 committed by Git OBS Bridge
parent f9d524f0bd
commit 0dac12c2f4
3 changed files with 18 additions and 1 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Oct 7 08:18:23 UTC 2013 - fridrich.strba@suse.com
- Create /var/lib/dbus/machine-id only if there is no /etc/machine-id
present on the system. Dbus knows how to use the system-wide
machine-id file and this solves problems where the two files have
different values (bnc#831626)
-------------------------------------------------------------------
Fri Oct 4 15:43:21 UTC 2013 - hrvoje.senjan@gmail.com

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Oct 7 08:18:23 UTC 2013 - fridrich.strba@suse.com
- Create /var/lib/dbus/machine-id only if there is no /etc/machine-id
present on the system. Dbus knows how to use the system-wide
machine-id file and this solves problems where the two files have
different values (bnc#831626)
-------------------------------------------------------------------
Fri Oct 4 15:43:21 UTC 2013 - hrvoje.senjan@gmail.com

View File

@ -27,6 +27,7 @@ DBUS_DAEMON_PID=$DBUS_DAEMON_PID_DIR/pid
DBUS_MACHINE_ID_DIR="/var/lib/dbus"
DBUS_MACHINE_ID=$DBUS_MACHINE_ID_DIR/machine-id
SYSTEM_MACHINE_ID="/etc/machine-id"
DBUS_UUIIDGEN_BIN=/bin/dbus-uuidgen
@ -49,7 +50,7 @@ rc_reset
case "$1" in
start)
if [ -x $DBUS_UUIIDGEN_BIN -a ! -e $DBUS_MACHINE_ID ] ; then
if [ -x $DBUS_UUIIDGEN_BIN -a ! -e $DBUS_MACHINE_ID -a ! -e $SYSTEM_MACHINE_ID ] ; then
if [ ! -d $DBUS_MACHINE_ID_DIR ] ; then
mkdir -p $DBUS_MACHINE_ID_DIR
chown messagebus:messagebus $DBUS_MACHINE_ID_DIR