summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2023-09-06 19:58:27 +0200
committerGitHub <noreply@github.com>2023-09-06 19:58:27 +0200
commit7d84904925990e489f7b785925272977bb5af0b3 (patch)
treeff6d1ed1ca51f241d465b468a35af4bec93ee46b
parentman: Add new Microsoft CAs to example (diff)
parentid128: add forgotten option to --help (diff)
downloadsystemd-7d84904925990e489f7b785925272977bb5af0b3.tar.xz
systemd-7d84904925990e489f7b785925272977bb5af0b3.zip
Merge pull request #29098 from keszybz/man-page-postreview-fixup
man/systemd-id128: fix example
-rw-r--r--man/systemd-id128.xml14
-rw-r--r--src/id128/id128.c1
2 files changed, 9 insertions, 6 deletions
diff --git a/man/systemd-id128.xml b/man/systemd-id128.xml
index 32226363cb..32c5af9671 100644
--- a/man/systemd-id128.xml
+++ b/man/systemd-id128.xml
@@ -161,10 +161,10 @@
<example>
<title>Show a well-known UUID</title>
<programlisting>
-$ systemd-id128 show -P user-home
+$ systemd-id128 show --value user-home
773f91ef66d449b5bd83d683bf40ad16
-$ systemd-id128 show -Pu user-home
+$ systemd-id128 show --value --uuid user-home
773f91ef-66d4-49b5-bd83-d683bf40ad16
$ systemd-id128 show 773f91ef-66d4-49b5-bd83-d683bf40ad16
@@ -183,16 +183,18 @@ $ systemd-id128 machine-id -u
$ systemd-id128 new -u
1fb8f24b-02df-458d-9659-cc8ace68e28a
-$ systemd-id128 --app=1fb8f24b-02df-458d-9659-cc8ace68e28a
+$ systemd-id128 machine-id -u -a 1fb8f24b-02df-458d-9659-cc8ace68e28a
47b82cb1-5339-43da-b2a6-1c350aef1bd1
-$ systemd-id128 -Pu show 3a9d668b-4db7-4939-8a4a-5e78a03bffb7 --app=1fb8f24b-02df-458d-9659-cc8ace68e28a
+$ systemd-id128 -Pu show 3a9d668b-4db7-4939-8a4a-5e78a03bffb7 \
+ -a 1fb8f24b-02df-458d-9659-cc8ace68e28a
47b82cb1-5339-43da-b2a6-1c350aef1bd1
</programlisting>
<para>On a given machine with the ID 3a9d668b-4db7-4939-8a4a-5e78a03bffb7, for the application
- 1fb8f24b-02df-458d-9659-cc8ace68e28a, we generate an application-specific machine ID. If we want to
- later recreate the same calculation on a different machine, we need to specify both IDs explicitly.
+ 1fb8f24b-02df-458d-9659-cc8ace68e28a, we generate an application-specific machine ID
+ (47b82cb1-5339-43da-b2a6-1c350aef1bd1). If we want to later recreate the same calculation on a
+ different machine, we need to specify both IDs explicitly as parameters to <command>show</command>.
</para>
</example>
</refsect1>
diff --git a/src/id128/id128.c b/src/id128/id128.c
index 9e0a3488dd..d726ab7051 100644
--- a/src/id128/id128.c
+++ b/src/id128/id128.c
@@ -178,6 +178,7 @@ static int help(void) {
"\nOptions:\n"
" -h --help Show this help\n"
" -p --pretty Generate samples of program code\n"
+ " -P --value Only print the value\n"
" -a --app-specific=ID Generate app-specific IDs\n"
" -u --uuid Output in UUID format\n"
"\nSee the %s for details.\n",