shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-08 08:58:50 +03:00
Code Releases Activity

conf: system_id_source is referencing CONFDIR

Browse Source 
Since we allow to configure /etc in configure and compile-in
dir for /etc we need to properly advertise this location later.
This commit is contained in:
Zdenek Kabelac 2015-05-14 10:50:21 +02:00
parent 6fb2552ef4
commit b7d80806b6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/example.conf.in
View File

@ -925,7 +925,7 @@ global {
# 'local' section of an lvm configuration file, e.g. lvmlocal.conf. # 'local' section of an lvm configuration file, e.g. lvmlocal.conf.
# uname - Set the system ID from the hostname (uname) of the system. # uname - Set the system ID from the hostname (uname) of the system.
# System IDs beginning localhost are not permitted. # 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. # system ID. Some systems create this file at installation time.
# See 'man machine-id'. # See 'man machine-id'.
# file - Use the contents of another file (system_id_file) to set # file - Use the contents of another file (system_id_file) to set

2
lib/config/config_settings.h
View File

@ -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" "'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" "uname - Set the system ID from the hostname (uname) of the system.\n"
"System IDs beginning localhost are not permitted.\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" "system ID. Some systems create this file at installation time.\n"
"See 'man machine-id'.\n" "See 'man machine-id'.\n"
"file - Use the contents of another file (system_id_file) to set\n" "file - Use the contents of another file (system_id_file) to set\n"