diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-10-11 12:20:28 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-10-11 12:20:28 +0000 |
| commit | 7b6830831687e50882c2a233e0c0e8281221c40f (patch) | |
| tree | e05338bb02d425fa372a13e7154e908e20c37311 | |
| parent | 23acc32c54cb1e8f2dac5bd4f5210e5665981458 (diff) | |
| download | drakx-backup-do-not-use-7b6830831687e50882c2a233e0c0e8281221c40f.tar drakx-backup-do-not-use-7b6830831687e50882c2a233e0c0e8281221c40f.tar.gz drakx-backup-do-not-use-7b6830831687e50882c2a233e0c0e8281221c40f.tar.bz2 drakx-backup-do-not-use-7b6830831687e50882c2a233e0c0e8281221c40f.tar.xz drakx-backup-do-not-use-7b6830831687e50882c2a233e0c0e8281221c40f.zip | |
(min_size) offer resizing NTFS again (broken by ntfsprogs -> ntfs-3g switch)
(backported from trunk)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/diskdrake/resize_ntfs.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 5 insertions, 1 deletions
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 |