From 425e3b92e537d929f91bb4908448eed06420b0e1 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 11 Oct 2012 12:20:28 +0000 Subject: (min_size) offer resizing NTFS again (broken by ntfsprogs -> ntfs-3g switch) (backported from trunk) --- perl-install/NEWS | 2 ++ perl-install/diskdrake/resize_ntfs.pm | 2 +- perl-install/install/NEWS | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 9ffe39a9b..63c5209d0 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- diskdrake: + o offer resizing NTFS again (broken by ntfsprogs -> ntfs-3g switch) - drakclock: o do not crash if timezones cannot be listed (mga#6787) diff --git a/perl-install/diskdrake/resize_ntfs.pm b/perl-install/diskdrake/resize_ntfs.pm index 16c2f9459..8fb6e0da6 100644 --- a/perl-install/diskdrake/resize_ntfs.pm +++ b/perl-install/diskdrake/resize_ntfs.pm @@ -22,7 +22,7 @@ sub min_size { my ($o) = @_; my $r; run_program::run('ntfsresize', '>', \$r, '-f', '-i', $o->{dev}) or die "ntfsresize failed:\n$r\n"; - $r =~ /minimal size: (\d+) KiB/ && $1 * 2; + $r =~ /You might resize at (\d+) bytes or / && $1 / 512; } sub resize { diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index c1384542c..6baebbc5a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- offer resizing NTFS again (broken by ntfsprogs -> ntfs-3g switch) + Version 14.22.1 - 31 May 2012 - proper design from original author -- cgit v1.2.1