mrc0mmand / rpms / lvm2

Forked from rpms/lvm2 3 years ago
Clone

Blame SOURCES/lvm2-set-default-preferred_names.patch

2b52f6
 conf/example.conf.in         | 2 +-
2b52f6
 lib/config/config_settings.h | 2 +-
2b52f6
 2 files changed, 2 insertions(+), 2 deletions(-)
2b52f6
2b52f6
diff --git a/conf/example.conf.in b/conf/example.conf.in
2b52f6
index 38855e9..7ccf928 100644
2b52f6
--- a/conf/example.conf.in
2b52f6
+++ b/conf/example.conf.in
2b52f6
@@ -106,7 +106,7 @@ devices {
2b52f6
 	# Example
2b52f6
 	# preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
2b52f6
 	# 
2b52f6
-	# This configuration option does not have a default value defined.
2b52f6
+	preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
2b52f6
 
2b52f6
 	# Configuration option devices/filter.
2b52f6
 	# Limit the block devices that are used by LVM commands.
2b52f6
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
2b52f6
index 0e81252..02e2b29 100644
2b52f6
--- a/lib/config/config_settings.h
2b52f6
+++ b/lib/config/config_settings.h
2b52f6
@@ -255,7 +255,7 @@ cfg(devices_external_device_info_source_CFG, "external_device_info_source", devi
2b52f6
 	"    compiled with udev support.\n"
2b52f6
 	"#\n")
2b52f6
 
2b52f6
-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,
2b52f6
+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,
2b52f6
 	"Select which path name to display for a block device.\n"
2b52f6
 	"If multiple path names exist for a block device, and LVM needs to\n"
2b52f6
 	"display a name for the device, the path names are matched against\n"