summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@luon.net>2006-10-25 16:42:37 +0000
committerSjoerd Simons <sjoerd@luon.net>2006-10-25 16:42:37 +0000
commit36608068cf84eca2a0e074fe6b1c416a4a8a2b08 (patch)
tree9d0d560728bbafec396b063cbe62755d7bca5ab7
parent2a78603b0e50a586e51faaf703229b6038e7e404 (diff)
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
-rw-r--r--ChangeLog7
-rw-r--r--dbus/Makefile.am2
-rw-r--r--tools/Makefile.am2
-rw-r--r--tools/dbus-uuidgen.125
4 files changed, 18 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e2342c7..2f238ced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index d9d588aa..c1d7bc2a 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -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
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 613b7158..015354d7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -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
diff --git a/tools/dbus-uuidgen.1 b/tools/dbus-uuidgen.1
index 7b533723..882acfec 100644
--- a/tools/dbus-uuidgen.1
+++ b/tools/dbus-uuidgen.1
@@ -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.