summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-05 20:49:07 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-05 20:49:07 +0000
commitcc5f83a12d817f8d34c8b7e75aa49f395d6d95b6 (patch)
tree78ae0da4b0e5e31f238834762d81ad9edff032e1
parent597121740527fc087b0b82c2efc7c7827d32eac0 (diff)
downloaddrakx-cc5f83a12d817f8d34c8b7e75aa49f395d6d95b6.tar
drakx-cc5f83a12d817f8d34c8b7e75aa49f395d6d95b6.tar.gz
drakx-cc5f83a12d817f8d34c8b7e75aa49f395d6d95b6.tar.bz2
drakx-cc5f83a12d817f8d34c8b7e75aa49f395d6d95b6.tar.xz
drakx-cc5f83a12d817f8d34c8b7e75aa49f395d6d95b6.zip
do not timeout after 10 minutes when resizing NTFS partition
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/diskdrake/resize_ntfs.pm2
-rw-r--r--perl-install/install/NEWS1
3 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5d9679476..3e4c70054 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,10 +3,10 @@
- diskdrake:
o fix resizing/formatting ntfs (broken because of ntfs-3g switch in previous
release)
+ o do not timeout after 10 minutes when resizing NTFS partition
- detect_devices:
o provide sysfs device path on Firewire and PCMCIA bus
(to be able to fix #33950 in drakx-net)
-
Version 10.9 - 5 March 2008
- adapt to new kernel-2.6.25's sysfs layout (Eric Pielbug, #38235)
diff --git a/perl-install/diskdrake/resize_ntfs.pm b/perl-install/diskdrake/resize_ntfs.pm
index ab99ce627..c6364fec6 100644
--- a/perl-install/diskdrake/resize_ntfs.pm
+++ b/perl-install/diskdrake/resize_ntfs.pm
@@ -30,7 +30,7 @@ sub resize {
my @l = ('-ff', '-s' . int($size / 2) . 'ki', $o->{dev});
my $r;
run_program::run('ntfsresize', '>', \$r, '-n', @l) or die "ntfsresize failed: $r\n";
- run_program::run('ntfsresize', '>', \$r, @l) or die "ntfsresize failed: $r\n";
+ run_program::raw({ timeout => 'never' }, 'ntfsresize', '>', \$r, @l) or die "ntfsresize failed: $r\n";
}
1;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b23ad3c0b..dad4ee007 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -4,6 +4,7 @@
- do not load i810fb, rely on vesa xorg drive instead (it may help #37772)
- restore correct configuration of nfs/hd media in urpmi.cfg
(regression introduced in 10.8)
+- do not timeout after 10 minutes when resizing NTFS partition
Version 10.8 - 4 March 2008