mrc0mmand / rpms / lvm2

Forked from rpms/lvm2 2 years ago
Clone

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

32e8bf
 conf/example.conf.in         | 5 +++--
22b171
 lib/config/config_settings.h | 2 +-
32e8bf
 2 files changed, 4 insertions(+), 3 deletions(-)
22b171
22b171
diff --git a/conf/example.conf.in b/conf/example.conf.in
32e8bf
index b4a55ae..aaf73a4 100644
22b171
--- a/conf/example.conf.in
22b171
+++ b/conf/example.conf.in
32e8bf
@@ -121,8 +121,9 @@ devices {
32e8bf
 	#
22b171
 	# Example
22b171
 	# preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
32e8bf
-	#
22b171
-	# This configuration option does not have a default value defined.
32e8bf
+	# 
22b171
+	# This configuration option has an automatic default value.
22b171
+	# preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
22b171
 
32e8bf
 	# Configuration option devices/use_devicesfile.
32e8bf
 	# Enable or disable the use of a devices file.
22b171
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
32e8bf
index d3a42a1..f5dac4d 100644
22b171
--- a/lib/config/config_settings.h
22b171
+++ b/lib/config/config_settings.h
22b171
@@ -269,7 +269,7 @@ cfg(devices_hints_CFG, "hints", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_
22b171
 	"    Use no hints.\n"
22b171
 	"#\n")
22b171
 
22b171
-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,
22b171
+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,
22b171
 	"Select which path name to display for a block device.\n"
22b171
 	"If multiple path names exist for a block device, and LVM needs to\n"
22b171
 	"display a name for the device, the path names are matched against\n"