34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
conf/example.conf.in | 5 +++--
|
|
lib/config/config_settings.h | 2 +-
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/conf/example.conf.in b/conf/example.conf.in
|
|
index b4a55ae..aaf73a4 100644
|
|
--- a/conf/example.conf.in
|
|
+++ b/conf/example.conf.in
|
|
@@ -121,8 +121,9 @@ devices {
|
|
#
|
|
# Example
|
|
# preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
|
|
- #
|
|
- # This configuration option does not have a default value defined.
|
|
+ #
|
|
+ # This configuration option has an automatic default value.
|
|
+ # preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
|
|
|
|
# Configuration option devices/use_devicesfile.
|
|
# Enable or disable the use of a devices file.
|
|
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
|
|
index 980fce6..9af8254 100644
|
|
--- a/lib/config/config_settings.h
|
|
+++ b/lib/config/config_settings.h
|
|
@@ -269,7 +269,7 @@ cfg(devices_hints_CFG, "hints", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_
|
|
" Use no hints.\n"
|
|
"#\n")
|
|
|
|
-cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_UNDEFINED , CFG_TYPE_STRING, NULL, vsn(1, 2, 19), NULL, 0, NULL,
|
|
+cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, "#S^/dev/mpath/#S^/dev/mapper/mpath#S^/dev/[hs]d", vsn(1, 2, 19), NULL, 0, NULL,
|
|
"Select which path name to display for a block device.\n"
|
|
"If multiple path names exist for a block device, and LVM needs to\n"
|
|
"display a name for the device, the path names are matched against\n"
|