conf: system_id_source is referencing CONFDIR

Since we allow to configure /etc in configure and compile-in
dir for /etc we need to properly advertise this location later.

diff --git a/conf/example.conf.in b/conf/example.conf.in
index fc27a9824d4e4697d8232c8da6c7848f2fceea5f..cc02e98f6ac159df2232033ad12153913890b368 100644 (file)
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -925,7 +925,7 @@ global {
        # 'local' section of an lvm configuration file, e.g. lvmlocal.conf.
        # uname - Set the system ID from the hostname (uname) of the system.
        # System IDs beginning localhost are not permitted.
-       # machineid - Use the contents of the file /etc/machine-id to set the
+       # machineid - Use the contents of the file @CONFDIR@/machine-id to set the
        # system ID.  Some systems create this file at installation time.
        # See 'man machine-id'.
        # file - Use the contents of another file (system_id_file) to set

diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index 4fd886d4efde9c8f6c027b4f9a3da13fa17d7cb4..d1d35b15eb9ec0c0ed7a7accb18c4246a7d816a3 100644 (file)
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -903,7 +903,7 @@ cfg(global_system_id_source_CFG, "system_id_source", global_CFG_SECTION, 0, CFG_
        "'local' section of an lvm configuration file, e.g. lvmlocal.conf.\n"
        "uname - Set the system ID from the hostname (uname) of the system.\n"
        "System IDs beginning localhost are not permitted.\n"
-       "machineid - Use the contents of the file /etc/machine-id to set the\n"
+       "machineid - Use the contents of the file " DEFAULT_ETC_DIR "/machine-id to set the\n"
        "system ID.  Some systems create this file at installation time.\n"
        "See 'man machine-id'.\n"
        "file - Use the contents of another file (system_id_file) to set\n"