diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2015-05-14 10:50:21 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-05-14 10:52:55 +0200 |
| commit | b7d80806b68a97cde6dfdf64ef7bc31e9c42a6b8 (patch) | |
| tree | a73589ad6adb8d1ed93aed417ed8fa5545a01e0a | |
| parent | 6fb2552ef47200af1e9b1a987cb3edfdc8f3ee66 (diff) | |
| download | lvm2-b7d80806b68a97cde6dfdf64ef7bc31e9c42a6b8.tar.gz | |
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.
| -rw-r--r-- | conf/example.conf.in | 2 | ||||
| -rw-r--r-- | lib/config/config_settings.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/example.conf.in b/conf/example.conf.in index fc27a9824..cc02e98f6 100644 --- 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 4fd886d4e..d1d35b15e 100644 --- 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" |