From 4c5cab24e54879a09d7b96cafd807e0abc2b0557 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Fri, 24 Aug 2018 20:11:58 -0400 Subject: [PATCH] Drop upstreamed patch --- gparted-1-pvresize-yes-flag-v1.patch | 53 ---------------------------- gparted.spec | 9 +++-- 2 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 gparted-1-pvresize-yes-flag-v1.patch diff --git a/gparted-1-pvresize-yes-flag-v1.patch b/gparted-1-pvresize-yes-flag-v1.patch deleted file mode 100644 index 085b20c..0000000 --- a/gparted-1-pvresize-yes-flag-v1.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2f090b4a2b649c30c649d36b9919e1d4a4f65c07 Mon Sep 17 00:00:00 2001 -From: Mike Fleetwood -Date: Mon, 11 Jun 2018 12:57:52 +0100 -Subject: [PATCH] Fix LVM2 PV shrinking with lvm2 2.02.171 and later (#1) - -Shrinking an LVM2 Physical Volume on CentOS 7 with the latest -lvm2 2.02.177 fails like this: - - Shrink /dev/sda9 from 1.00 GiB to 768.00 MiB - * calibrate /dev/sda9 - * check file system on /dev/sda9 for errors and (if possib...(SUCCESS) - * shrink file system (ERROR) - * lvm pvresize -v --setphysicalvolumesize 786432K '/dev/...(ERROR) - 0 physical volume(s) resized / 1 physical volume(s) not resized - - Wiping internal VG cache - Wiping cache of LVM-capable devices - /dev/sda9: Requested size 712.00 MiB is less than real size 1.00 GiB. Proceed? [y/n]:[n] - Physical Volume /dev/sda9 not resized. - -This upstream change to lvm2 [1] makes pvresize prompt for confirmation -whenever the --setphysicalvolumesize option is used. (The change was -included in lvm2 2.02.171 and later, which is used in recent -distributions. The reporter found the issue on Ubuntu 18.04 LTS and I -reproduced the issue on RHEL/CentOS 7.5). The set size option has to be -used when shrinking the PV before shrinking the partition therefore fix -this issue by adding lvm common option --yes when using the set size -option. - -[1] https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=cbc69f8c693edf0d1307c9447e2e66d07a04bfe9 - pvresize: Prompt when non-default size supplied. - -Closes #1 - Can't shrink LVM partition due to pvresize prompt ---- - src/lvm2_pv.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/lvm2_pv.cc b/src/lvm2_pv.cc -index 15af3eb..5f7c7bb 100644 ---- a/src/lvm2_pv.cc -+++ b/src/lvm2_pv.cc -@@ -102,7 +102,7 @@ bool lvm2_pv::resize( const Partition & partition_new, OperationDetail & operati - { - Glib::ustring size = "" ; - if ( ! fill_partition ) -- size = " --setphysicalvolumesize " + -+ size = " --yes --setphysicalvolumesize " + - Utils::num_to_str( floor( Utils::sector_to_unit( - partition_new .get_sector_length(), partition_new .sector_size, UNIT_KIB ) ) ) + "K " ; - return ! execute_command( "lvm pvresize -v " + size + Glib::shell_quote( partition_new.get_path() ), --- -1.7.1 - diff --git a/gparted.spec b/gparted.spec index f9a561b..44c78a2 100644 --- a/gparted.spec +++ b/gparted.spec @@ -1,14 +1,12 @@ Summary: Gnome Partition Editor Name: gparted Version: 0.32.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/System License: GPLv2+ URL: http://gparted.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: gparted-1-pvresize-yes-flag-v1.patch - BuildRequires: gtkmm24-devel BuildRequires: parted-devel BuildRequires: libuuid-devel @@ -34,8 +32,6 @@ will be detected at runtime and don't require a rebuild of GParted %prep %setup -q -%patch0 -p1 - %build %configure --enable-libparted-dmraid --enable-online-resize --enable-xhost-root %make_build @@ -78,6 +74,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.a %{_mandir}/man8/gparted.* %changelog +* Fri Aug 24 2018 Mukundan Ragavan - 0.32.0-2 +- Drop upstreamed patch + * Fri Aug 24 2018 Mukundan Ragavan - 0.32.0-1 - Update to 0.32.0