lvm2/lvm2-set-default-preferred_names.patch

32 lines
1.6 KiB
Diff
Raw Normal View History

2015-05-04 12:47:56 +00:00
conf/example.conf.in | 3 +--
lib/config/config_settings.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/conf/example.conf.in b/conf/example.conf.in
index c1a8f03..2b04496 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -91,8 +91,7 @@ devices {
# Rule 4 prefers the path with least value in lexicographical order.
# Example:
# preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
- # This configuration option does not have a default value defined.
- # preferred_names=[]
+ preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
2015-05-04 12:47:56 +00:00
# Configuration option devices/filter.
# Limit the block devices that are used by LVM commands.
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index 31609d4..ac5cf5f 100644
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -186,7 +186,7 @@ cfg(devices_external_device_info_source_CFG, "external_device_info_source", devi
"udev - Reuse existing udev database records. Applicable\n"
"only if LVM is compiled with udev support.\n")
2015-05-04 12:47:56 +00:00
-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_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,\n"
"and LVM needs to display a name for the device,\n"