summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-10-11 12:19:16 +0000
committerThierry Vignaud <tv@mageia.org>2012-10-11 12:19:16 +0000
commit99b7dd01b07b200032e05324aaf7d46ceaafa706 (patch)
tree480563220ffdd55676353d26fc7fac7857f33bc3 /perl-install
parentb641bc87c4e75ca0c21774e67c65f84bfa949dd8 (diff)
downloaddrakx-backup-do-not-use-99b7dd01b07b200032e05324aaf7d46ceaafa706.tar
drakx-backup-do-not-use-99b7dd01b07b200032e05324aaf7d46ceaafa706.tar.gz
drakx-backup-do-not-use-99b7dd01b07b200032e05324aaf7d46ceaafa706.tar.bz2
drakx-backup-do-not-use-99b7dd01b07b200032e05324aaf7d46ceaafa706.tar.xz
drakx-backup-do-not-use-99b7dd01b07b200032e05324aaf7d46ceaafa706.zip
(min_size) offer resizing NTFS again (broken by ntfsprogs -> ntfs-3g switch)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/diskdrake/resize_ntfs.pm2
-rw-r--r--perl-install/install/NEWS2
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