Modify patch that enables lvmetad for it to be applicable again (the lvm.conf context changed).

This commit is contained in:
Peter Rajnoha 2013-10-04 16:04:19 +02:00
parent 39ac4a4deb
commit 308345993f

View File

@ -3,23 +3,23 @@
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/conf/example.conf.in b/conf/example.conf.in diff --git a/conf/example.conf.in b/conf/example.conf.in
index fb96079..962680b 100644 index ae571b6..241caa1 100644
--- a/conf/example.conf.in --- a/conf/example.conf.in
+++ b/conf/example.conf.in +++ b/conf/example.conf.in
@@ -571,7 +571,7 @@ global { @@ -594,7 +594,7 @@ global {
# setting itself. # supported in clustered environment. If use_lvmetad=1 and locking_type=3
# To prevent scanning devices completely, even when using lvmetad, # is set at the same time, LVM always issues a warning message about this
# the devices/global_filter must be used. # and then it automatically disables lvmetad use.
- use_lvmetad = 0 - use_lvmetad = 0
+ use_lvmetad = 1 + use_lvmetad = 1
# Full path of the utility called to check that a thin metadata device # Full path of the utility called to check that a thin metadata device
# is in a state that allows it to be used. # is in a state that allows it to be used.
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index 3549b6d..e1b096b 100644 index c935920..a9f35e6 100644
--- a/lib/config/config_settings.h --- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h +++ b/lib/config/config_settings.h
@@ -156,7 +156,7 @@ cfg(global_metadata_read_only_CFG, "metadata_read_only", global_CFG_SECTION, 0, @@ -158,7 +158,7 @@ cfg(global_metadata_read_only_CFG, "metadata_read_only", global_CFG_SECTION, 0,
cfg(global_mirror_segtype_default_CFG, "mirror_segtype_default", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_MIRROR_SEGTYPE, vsn(2, 2, 87), NULL) cfg(global_mirror_segtype_default_CFG, "mirror_segtype_default", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_MIRROR_SEGTYPE, vsn(2, 2, 87), NULL)
cfg(global_raid10_segtype_default_CFG, "raid10_segtype_default", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_RAID10_SEGTYPE, vsn(2, 2, 99), NULL) cfg(global_raid10_segtype_default_CFG, "raid10_segtype_default", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_RAID10_SEGTYPE, vsn(2, 2, 99), NULL)
cfg(global_lvdisplay_shows_full_device_path_CFG, "lvdisplay_shows_full_device_path", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH, vsn(2, 2, 89), NULL) cfg(global_lvdisplay_shows_full_device_path_CFG, "lvdisplay_shows_full_device_path", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH, vsn(2, 2, 89), NULL)