diff --git a/.gitignore b/.gitignore index 0c4316c..91eaf54 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ /LVM2.2.02.154.tgz /LVM2.2.02.155.tgz /LVM2.2.02.156.tgz +/LVM2.2.02.157.tgz diff --git a/LVM2.2.02.156.tgz b/LVM2.2.02.156.tgz deleted file mode 100644 index 126abca..0000000 Binary files a/LVM2.2.02.156.tgz and /dev/null differ diff --git a/LVM2.2.02.157.tgz.asc b/LVM2.2.02.157.tgz.asc new file mode 100644 index 0000000..99042cf --- /dev/null +++ b/LVM2.2.02.157.tgz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEABECAAYFAldj980ACgkQIoGRwVZ+LBeHrACcD8iKfFVo2Ox4IALbgySPkHt8 +Hv0AoME+MyLuKul7VQ07dSZRShi/M3iR +=wusL +-----END PGP SIGNATURE----- diff --git a/lvm2-2_02_156-fix-regression-in-blkdeactivate-causing-devs-to-be-skipped.patch b/lvm2-2_02_156-fix-regression-in-blkdeactivate-causing-devs-to-be-skipped.patch deleted file mode 100644 index 2862cad..0000000 --- a/lvm2-2_02_156-fix-regression-in-blkdeactivate-causing-devs-to-be-skipped.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in -index 2a48b3e..b4c3237 100644 ---- a/scripts/blkdeactivate.sh.in -+++ b/scripts/blkdeactivate.sh.in -@@ -193,8 +193,7 @@ deactivate_holders () { - } - - deactivate_dm () { -- local name -- name=$(printf "%s" "$name") -+ local name=$(printf "%s" "$name") - test -b "$DEV_DIR/mapper/$name" || return 0 - test -z ${SKIP_DEVICE_LIST["$kname"]} || return 1 - -@@ -263,8 +262,7 @@ deactivate_lvm () { - } - - deactivate_md () { -- local name -- name=$(printf "%s" "$name") -+ local name=$(printf "%s" "$name") - test -b "$DEV_DIR/$name" || return 0 - test -z ${SKIP_DEVICE_LIST["$kname"]} || return 1 - diff --git a/lvm2-lvmdbusd-remove-chmod-from-makefile-for-nonexistent-pyo-files.patch b/lvm2-lvmdbusd-remove-chmod-from-makefile-for-nonexistent-pyo-files.patch deleted file mode 100644 index de21015..0000000 --- a/lvm2-lvmdbusd-remove-chmod-from-makefile-for-nonexistent-pyo-files.patch +++ /dev/null @@ -1,16 +0,0 @@ - daemons/lvmdbusd/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in -index 658fcd8..c9b6a07 100644 ---- a/daemons/lvmdbusd/Makefile.in -+++ b/daemons/lvmdbusd/Makefile.in -@@ -57,7 +57,7 @@ install_lvmdbusd: - $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(DESTDIR)$(lvmdbusdir) - PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbusdir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES) - $(CHMOD) 755 $(DESTDIR)$(lvmdbusdir)/__pycache__ -- $(CHMOD) 444 $(DESTDIR)$(lvmdbusdir)/__pycache__/*.pyc $(DESTDIR)$(lvmdbusdir)/__pycache__/*.pyo -+ $(CHMOD) 444 $(DESTDIR)$(lvmdbusdir)/__pycache__/*.pyc - - install_lvm2: install_lvmdbusd - diff --git a/lvm2.spec b/lvm2.spec index 464826f..4253ad5 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -52,8 +52,8 @@ Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.156 -Release: 1%{?dist} +Version: 2.02.157 +Release: 2%{?dist} License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -834,6 +834,9 @@ the device-mapper event library. %{_libdir}/pkgconfig/devmapper-event.pc %changelog +* Fri Jun 17 2016 Peter Rajnoha - 2.02.157-1 +- Change pvscan --cache -aay to scan locally if lvmetad fails. + * Mon Jun 13 2016 Peter Rajnoha - 2.02.156-1 - Don't allow duplicate orphan PVs to be used with vgcreate/vgextend/pvcreate. - Improve handling of lvmetad update failures. diff --git a/sources b/sources index 5f96ec9..f192ab5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c119be1af5e96deb2b17c4e43b8eb51b LVM2.2.02.156.tgz +fbe85b1c8527d0302c66d465ab05f3e3 LVM2.2.02.157.tgz diff --git a/upstream b/upstream index a2e29fa..5a4ce4e 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -LVM2.2.02.156.tgz +LVM2.2.02.157.tgz