From dbc061b8123799e9352ab069b4dc1b5ea394587d Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 15 Nov 2006 01:52:01 +0000 Subject: 2006-11-14 Havoc Pennington * dbus/dbus-internals.c (_dbus_generate_uuid): The spec said the UUID had the timestamp last, but the implementation had it first; move it to last since I think it's a tiny bit nicer (easier to compare at a glance, faster to sort, less code), and will not cause any practical compatibility problems. Also, always convert the timestamp to big endian. * doc/dbus-specification.xml: Clean up the docs on the UUID. * tools/dbus-uuidgen.1: more prominently say it is not suitable as a replacement for regular uuidgen/RFC4122. --- tools/dbus-uuidgen.1 | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/dbus-uuidgen.1 b/tools/dbus-uuidgen.1 index 882acfec..480fd18f 100644 --- a/tools/dbus-uuidgen.1 +++ b/tools/dbus-uuidgen.1 @@ -13,6 +13,11 @@ dbus-uuidgen \- Utility to generate UUIDs The \fIdbus-uuidgen\fP command generates or reads a universally unique ID. +.PP +Note that the D-Bus UUID has no relationship to RFC 4122 and does not generate +UUIDs compatible with that spec. Many systems have a separate command +for that (often called "uuidgen"). + .PP See http://www.freedesktop.org/software/dbus/ for more information about D-Bus. @@ -39,15 +44,11 @@ IDs, and so forth. .PP If you run \fIdbus-uuidgen\fP with no options it just prints a new uuid made -up out of thin air. This is similar to the regular "uuidgen" command. - -.PP -If you run it with --get, it prints the machine uuid by default, or -the uuid in the specified file if you specify a file. +up out of thin air. .PP -The D-Bus UUID has no relationship to RFC 4122 and does not generate -UUIDs compatible with that spec. +If you run it with --get, it prints the machine UUID by default, or +the UUID in the specified file if you specify a file. .PP If you try to change an existing machine-id on a running system, it will @@ -55,6 +56,10 @@ 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 +The UUID should be different on two different virtual machines, +because there are two different kernels. + .SH OPTIONS The following options are supported: .TP -- cgit