From fe822f704305b6bda5ebdf915a4f40be89f5ec67 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andre=20Kl=C3=A4rner?= Date: Mon, 5 Feb 2024 13:57:30 -0600 Subject: [PATCH] system_id: explain the reason for choosing appmachineid over machineid Since understanding the reason for choosing the appmachineid over the direct use of machineid is not easily found, I extended to help text to clarify this a bit. --- lib/config/config_settings.h | 5 +++-- man/lvmsystemid.7_main | 8 ++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index 0f1e9af55..5c70aae18 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -1327,8 +1327,9 @@ cfg(global_system_id_source_CFG, "system_id_source", global_CFG_SECTION, CFG_DEF " Use an LVM-specific derivation of the local machine-id as the\n" " system ID. See 'man machine-id'.\n" " machineid\n" - " Use the contents of the machine-id file to set the system ID\n" - " (appmachineid is recommended.)\n" + " Use the contents of the machine-id file to set the system ID.\n" + " (appmachineid is recommended to avoid exposing the confidential\n" + " machine-id.)\n" " file\n" " Use the contents of another file (system_id_file) to set the\n" " system ID.\n" diff --git a/man/lvmsystemid.7_main b/man/lvmsystemid.7_main index 06e7f3454..79dd4cf9e 100644 --- a/man/lvmsystemid.7_main +++ b/man/lvmsystemid.7_main @@ -192,12 +192,8 @@ global { .B machineid .br The content of /etc/machine-id is used as the system ID if available. -See -.BR machine-id (5) -and -.BR systemd-machine-id-setup (1) -to check if machine-id is available on the host. -(appmachineid is recommended in place of machineid.) +(appmachineid is recommended to avoid exposing the confidential +machine-id.) .sp .I lvm.conf .nf -- 2.43.5