lvm2/0001-lvm2-set-default-preferred_names.patch

27 lines
1.4 KiB
Diff
Raw Normal View History

2019-09-30 11:03:04 -04:00
diff --git a/conf/example.conf.in b/conf/example.conf.in
2020-07-16 14:44:15 +08:00
index 05b0857..7f0a687 100644
2019-09-30 11:03:04 -04:00
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
2020-07-16 14:44:15 +08:00
@@ -122,7 +122,7 @@ devices {
2019-09-30 11:03:04 -04:00
# Example
# preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
#
- # This configuration option does not have a default value defined.
+ preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
# 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
2020-07-16 14:44:15 +08:00
index 2bb72ba..f280156 100644
2019-09-30 11:03:04 -04:00
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
2020-07-16 14:44:15 +08:00
@@ -269,7 +269,7 @@ cfg(devices_hints_CFG, "hints", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_
" Use no hints.\n"
2019-09-30 11:03:04 -04:00
"#\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_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"