diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-10-11 12:19:16 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-10-11 12:19:16 +0000 |
| commit | 993f9b1a28761e7e137cea4ae21d5263f0ded007 (patch) | |
| tree | 480563220ffdd55676353d26fc7fac7857f33bc3 | |
| parent | 8855fcd5ca1148df8b5c27e100cdb3bf434be7ed (diff) | |
| download | drakx-993f9b1a28761e7e137cea4ae21d5263f0ded007.tar drakx-993f9b1a28761e7e137cea4ae21d5263f0ded007.tar.gz drakx-993f9b1a28761e7e137cea4ae21d5263f0ded007.tar.bz2 drakx-993f9b1a28761e7e137cea4ae21d5263f0ded007.tar.xz drakx-993f9b1a28761e7e137cea4ae21d5263f0ded007.zip | |
(min_size) offer resizing NTFS again (broken by ntfsprogs -> ntfs-3g switch)
| -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 fd9efb336..11d11b666 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) - drakfont: 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 9f6a6504b..2dcc4fb8e 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.46.3 - 5 October 2012 - load 'microcode' asynchronously, preventing big wait when not supported |