From 6343e9e9084cdbf1a0e887ca5bd95aaa84cc10a4 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 2 Dec 2002 17:01:34 +0000
Subject: formatting timeout is now 1 hour

---
 perl-install/fs.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index b92995b42..3446e5423 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -544,7 +544,7 @@ sub format_ext2($@) {
     my ($dev, @options) = @_;
     $dev =~ m,(rd|ida|cciss)/, and push @options, qw(-b 4096 -R stride=16); #- For RAID only.
     push @options, qw(-b 1024 -O none) if arch() =~ /alpha/;
-    run_program::run('mke2fs', '-F', @options, devices::make($dev)) or die N("%s formatting of %s failed", grep { $_ eq '-j' } @options ? "ext3" : "ext2", $dev);
+    run_program::run({ timeout => 60 * 60 }, 'mke2fs', '-F', @options, devices::make($dev)) or die N("%s formatting of %s failed", grep { $_ eq '-j' } @options ? "ext3" : "ext2", $dev);
 }
 sub format_ext3 {
     my ($dev, @options) = @_;
@@ -554,23 +554,23 @@ sub format_ext3 {
 sub format_reiserfs {
     my ($dev, @options) = @_;
     #TODO add -h tea
-    run_program::run("mkreiserfs", "-ff", @options, devices::make($dev)) or die N("%s formatting of %s failed", "reiserfs", $dev);
+    run_program::run({ timeout => 60 * 60 }, "mkreiserfs", "-ff", @options, devices::make($dev)) or die N("%s formatting of %s failed", "reiserfs", $dev);
 }
 sub format_xfs {
     my ($dev, @options) = @_;
-    run_program::run("mkfs.xfs", "-f", "-q", @options, devices::make($dev)) or die N("%s formatting of %s failed", "xfs", $dev);
+    run_program::run({ timeout => 60 * 60 }, "mkfs.xfs", "-f", "-q", @options, devices::make($dev)) or die N("%s formatting of %s failed", "xfs", $dev);
 }
 sub format_jfs {
     my ($dev, @options) = @_;
-    run_program::run("mkfs.jfs", "-f", @options, devices::make($dev)) or die N("%s formatting of %s failed", "jfs", $dev);
+    run_program::run({ timeout => 60 * 60 }, "mkfs.jfs", "-f", @options, devices::make($dev)) or die N("%s formatting of %s failed", "jfs", $dev);
 }
 sub format_dos {
     my ($dev, @options) = @_;
-    run_program::run("mkdosfs", @options, devices::make($dev)) or die N("%s formatting of %s failed", "dos", $dev);
+    run_program::run({ timeout => 60 * 60 }, "mkdosfs", @options, devices::make($dev)) or die N("%s formatting of %s failed", "dos", $dev);
 }
 sub format_hfs {
     my ($dev, @options) = @_;
-    run_program::run("hformat", @options, devices::make($dev)) or die N("%s formatting of %s failed", "HFS", $dev);
+    run_program::run({ timeout => 60 * 60 }, "hformat", @options, devices::make($dev)) or die N("%s formatting of %s failed", "HFS", $dev);
 }
 sub real_format_part {
     my ($part) = @_;
@@ -699,13 +699,13 @@ sub mount {
 	    $mount_opt = 'notail'; #- notail in any case
 	} elsif ($fs eq 'jfs' && !$rdonly) {
 	    #- needed if the system is dirty otherwise mounting read-write simply fails
-	    run_program::run("fsck.jfs", $dev) or do {
+	    run_program::run({ timeout => 60 * 60 }, "fsck.jfs", $dev) or do {
 		my $err = $?;
 		die "fsck.jfs failed" if $err & 0xfc00;
 	    };
 	} elsif ($fs eq 'ext2' || $fs eq 'ext3' && $::isInstall) {
 	    foreach ('-a', '-y') {
-		run_program::run("fsck.ext2", $_, $dev);
+		run_program::run({ timeout => 60 * 60 }, "fsck.ext2", $_, $dev);
 		my $err = $?;
 		if ($err & 0x0100) { log::l("fsck corrected partition $dev") }
 		if ($err & 0xfeff) {
-- 
cgit v1.2.1