fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 06:28:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-10-25 Sjoerd Simons <sjoerd@luon.net>

Browse source 
* dbus/Makefile.am:
   * tools/Makefile.am:
   * toos/dbus-uuidgen.1:
      Move the machine-id file to /var/lib/dbus
This commit is contained in:
Sjoerd Simons 2006-10-25 16:42:37 +00:00
parent 2a78603b0e
commit 36608068cf
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-10-25 Sjoerd Simons <sjoerd@luon.net>
* dbus/Makefile.am:
* tools/Makefile.am:
* toos/dbus-uuidgen.1:
Move the machine-id file to /var/lib/dbus
2006-10-24 David Zeuthen <davidz@redhat.com>
* dbus/dbus-threads.c (init_uninitialized_locks): Fix typo so it's

2
dbus/Makefile.am
View file

@ -1,7 +1,7 @@
configdir=$(sysconfdir)/dbus-1
INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\"
INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
dbusincludedir=$(includedir)/dbus-1.0/dbus
dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus

2
tools/Makefile.am
View file

@ -1,6 +1,6 @@
configdir=$(sysconfdir)/dbus-1
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\"
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
bin_PROGRAMS=dbus-send dbus-monitor dbus-launch dbus-cleanup-sockets dbus-uuidgen

25
tools/dbus-uuidgen.1
View file

@ -25,7 +25,7 @@ script of a D-Bus package like this:
.fi
.PP
This will ensure that /etc/dbus-1/machine-id exists and has the uuid in it.
This will ensure that /var/lib/dbus/machine-id exists and has the uuid in it.
It won't overwrite an existing uuid, since this id should remain fixed
for a single machine until the next reboot at least.
@ -50,31 +50,24 @@ The D-Bus UUID has no relationship to RFC 4122 and does not generate
UUIDs compatible with that spec.
.PP
If you try to change an existing /etc/dbus-1/machine-id on a running
system, it will probably result in bad things happening. Don't try
to change this file. Also, don't make it the same on two different
systems; it needs to be different anytime there are two different
kernels running.
.PP
If you need to share /etc between two different kernels, a possible solution
is to symlink the machine ID to /var, and run "dbus-uuidgen
--ensure=/var/whatever" from an early boot script or the system
message bus boot script.
If you try to change an existing machine-id on a running system, it will
probably result in bad things happening. Don't try to change this file. Also,
don't make it the same on two different systems; it needs to be different
anytime there are two different kernels running.
.SH OPTIONS
The following options are supported:
.TP
.I "--get[=FILENAME]"
If a filename is not given, defaults to sysconfdir/dbus-1/machine-id
(sysconfdir is usually /etc). If this file exists and is valid, the
If a filename is not given, defaults to localstatedir/lib/dbus/machine-id
(localstatedir is usually /var). If this file exists and is valid, the
uuid in the file is printed on stdout. Otherwise, the command exits
with a nonzero status.
.TP
.I "--ensure[=FILENAME]"
If a filename is not given, defaults to sysconfdir/dbus-1/machine-id
(sysconfdir is usually /etc). If this file exists then it will be
If a filename is not given, defaults to localstatedir/lib/dbus/machine-id
(localstatedir is usually /var). If this file exists then it will be
validated, and a failure code returned if it contains the wrong thing.
If the file does not exist, it will be created with a new uuid in it.
On success, prints no output.