From b477c6949a4c3cd6b861b473134b3f2630292c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 6 Sep 2023 09:59:11 +0200 Subject: [PATCH 1/2] man/systemd-id128: fix example The example was supposed to show how machine-id/new/machine-id --app-specific/show --app-specific tie together, but the verb was ommitted. I also extended the explanation a bit and used long option form in the first example for more clarity. In the second, more complicated example, the one-letter form is used for brevity. Noticed in post-review: https://github.com/systemd/systemd/pull/28988/commits/b37e8184a5a376749fbf68674ed6d7a4fc9901aa#r1315678438 --- man/systemd-id128.xml | 14 ++++++++------ 1 file changed, 8 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 @@ Show a well-known UUID -$ 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 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 show. From bf91ab6e1e1463c5f0181f195a7488d987ea2725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 6 Sep 2023 16:58:50 +0200 Subject: [PATCH 2/2] id128: add forgotten option to --help --- src/id128/id128.c | 1 + 1 file changed, 1 insertion(+) 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",