diff --git a/.gitignore b/.gitignore index d0c54f0..0b3333f 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /LVM2.2.02.118.tgz /LVM2.2.02.119.tgz /LVM2.2.02.120.tgz +/LVM2.2.02.122.tgz diff --git a/LVM2.2.02.120.tgz.asc b/LVM2.2.02.120.tgz.asc deleted file mode 100644 index 671c4b4..0000000 --- a/LVM2.2.02.120.tgz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEABECAAYFAlVWcqQACgkQIoGRwVZ+LBeiKgCg6vIAWhC7AZcf01Qf505sty3A -HOwAoJGo8JYHscwGMo3FSIkLWHjbcRq0 -=96gn ------END PGP SIGNATURE----- diff --git a/LVM2.2.02.122.tgz.asc b/LVM2.2.02.122.tgz.asc new file mode 100644 index 0000000..cb14a59 --- /dev/null +++ b/LVM2.2.02.122.tgz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEABECAAYFAlWErYsACgkQIoGRwVZ+LBfFwACeJ2+4ZMH/Y0cWISLtptTAP1rv +/csAnj9BKH5ZKxkhzgB694usg/38F9+M +=WH10 +-----END PGP SIGNATURE----- diff --git a/lvm2-set-default-preferred_names.patch b/lvm2-set-default-preferred_names.patch index a574fd2..4037808 100644 --- a/lvm2-set-default-preferred_names.patch +++ b/lvm2-set-default-preferred_names.patch @@ -1,9 +1,8 @@ - conf/example.conf.in | 2 +- - lib/config/config_settings.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + conf/example.conf.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/example.conf.in b/conf/example.conf.in -index e809488..cebf464 100644 +index e809488..0069c90 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in @@ -92,7 +92,7 @@ devices { @@ -11,20 +10,7 @@ index e809488..cebf464 100644 # 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" ] ++ 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 -index 885a2fa..97cf3b3 100644 ---- a/lib/config/config_settings.h -+++ b/lib/config/config_settings.h -@@ -202,7 +202,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") - --cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED , 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_DEFAULT_COMMENTED , 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" diff --git a/lvm2.spec b/lvm2.spec index 036b78d..9c175f6 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -1,4 +1,4 @@ -%define device_mapper_version 1.02.97 +%define device_mapper_version 1.02.99 %define enable_cache 1 %define enable_cluster 1 @@ -43,8 +43,8 @@ Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.120 -Release: 2%{?dist} +Version: 2.02.122 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -734,6 +734,35 @@ the device-mapper event library. %{_libdir}/pkgconfig/devmapper-event.pc %changelog +* Mon Jun 22 2015 Peter Rajnoha - 2.02.122-1 +- Flush stdout before printing to stderr. +- Use pre-allocated buffer for printed LV names in display_lvname. +- Support thins with size of external origin unaligned with thin pool chunk. +- Allow extension of reduced thin volumes with external origins. +- Consider snapshot and origin LV as unusable if component devices suspended. +- Fix lvmconfig segfault on settings with undefined default value (2.02.120). +- Add explicit 's' (shared) LV activation mode. +- Ignore hyphens in long options names (i.e. --long-option == --longoption). +- Distinguish between on-disk and lvmetad versions of text metadata. +- Remove DL_LIBS from Makefiles for daemons that don't need them. +- Zero errno in before strtoul call in dmsetup if tested after the call. +- Zero errno in before strtoul call in lvmpolld. +- Fix a segfault in pvscan --cache --background command. +- Fix test for AREA_PV when checking for failed mirrors. +- Do not use --sysinit in lvm2-activation{-early,-net}.service if lvmpolld used. +- Maintain outdated PV info in lvmetad till all old metadata is gone from disk. +- Do not fail polling when poll LV not found (already finished or removed). +- Replace poll_get_copy_vg/lv fns with vg_read() and find_lv() in polldaemon. +- Close all device fds only in before sleep call in polldaemon. +- Simplify Makefile targets that generate exported symbols. +- Move various -D settings from Makefiles to configure.h. +- New dm_tree_node_set_thin_pool_read_only(DM_1_02_99) for read-only thin pool. +- Enhance error message when thin-pool message fails. +- Fix dmeventd logging to avoid threaded use of static variable. +- Remove redundant dmeventd SIGALRM coded. +- Add dm_task_get_errno() to return any unexpected errno from a dm ioctl call. +- Use copy of errno made after each dm ioctl call in case errno changes later. + * Wed Jun 17 2015 Fedora Release Engineering - 2.02.120-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 4b0a059..45f39b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -326df8542d3a2376da907e98a0888ccf LVM2.2.02.120.tgz +a88bf7d68955635d009a5aec1ffecc48 LVM2.2.02.122.tgz diff --git a/upstream b/upstream index 825478f..7007071 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -LVM2.2.02.120.tgz +LVM2.2.02.122.tgz