From a4023a43d0312568f0b81b39b4bc6fd9b64880eb Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 13 Jul 2012 22:55:52 +0200 Subject: man: Split sd_randomize(3) from sd_id128_get_{machine,boot}(3) They have too little to do with each other... --- man/sd_id128_randomize.xml | 55 +++++++--------------------------------------- 1 file changed, 8 insertions(+), 47 deletions(-) (limited to 'man/sd_id128_randomize.xml') diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml index cb37419663..be74937dd0 100644 --- a/man/sd_id128_randomize.xml +++ b/man/sd_id128_randomize.xml @@ -44,9 +44,7 @@ sd_id128_randomize - sd_id128_get_machine - sd_id128_get_boot - Generate or retrieve 128 bit IDs + Generate 128 bit IDs @@ -58,16 +56,6 @@ sd_id128_t* ret - - int sd_id128_get_machine - sd_id128_t* ret - - - - int sd_id128_get_boot - sd_id128_t* ret - - @@ -81,36 +69,10 @@ /dev/urandom kernel random number generator. - sd_id128_get_machine() - returns the machine ID of the executing host. This - reads and parses the - machine-id5 - file. This function caches the machine ID internally - to make retrieving the machine ID a cheap - operation. - - sd_id128_get_boot() returns - the boot ID of the executing kernel. This reads and - parses the - /proc/sys/kernel/random/boot_id - file exposed by the kernel. It is randomly generated - early at boot and is unique for every running kernel - instance. See - random4 - for more information. This function also internally - caches the returned ID to make this call a cheap - operation. - Note that - sd_id128_randomize() and - sd_id128_get_boot() always return + sd_id128_randomize() always returns a UUID v4 compatible - ID. sd_id128_get_machine() will - also return a UUID v4 compatible ID on new - installations, but might not on older. It is possible - to convert the machine ID into an UUID v4 compatible - one. For more information see - machine-id5. + ID. For more information about the sd_id128_t type see @@ -125,7 +87,7 @@ Return Value - The three calls return 0 on success (in which + The call returns 0 on success (in which case ret is filled in), or a negative errno-style error code. @@ -133,10 +95,8 @@ Notes - The sd_id128_randomize(), - sd_id128_get_machine() and - sd_id128_get_boot() interfaces - are available as shared library, which can be compiled + The sd_id128_randomize() interface + is available as shared library, which can be compiled and linked to with the libsystemd-id128 pkg-config1 @@ -150,7 +110,8 @@ systemd1, sd-id1283, machine-id5, - random4 + random4, + sd_id128_get_machine3 -- cgit v1.2.3-54-g00ecf