From 858439cfcc2ad376ec7901a64eb3e5d345373ea9 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 18 Nov 2003 12:11:06 +0000
Subject: getHds called by install_steps must not be interactive

---
 perl-install/fsedit.pm        | 8 ++++----
 perl-install/install_any.pm   | 4 ++--
 perl-install/install_steps.pm | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 13ef8cca1..1bd99657d 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -241,12 +241,12 @@ sub hds {
 
 sub get_hds {
     #- $in is optional
-    my ($flags, $in) = @_;
+    my ($flags, $o_in) = @_;
 
-    if ($in) {
+    if ($o_in) {
 	catch_cdie { hds($flags, sub {
 	    my ($dev, $err) = @_;
-            $in->ask_yesorno(N("Error"), 
+            $o_in->ask_yesorno(N("Error"), 
 N("I can't read the partition table of device %s, it's too corrupted for me :(
 I can try to go on, erasing over bad partitions (ALL DATA will be lost!).
 The other solution is to not allow DrakX to modify the partition table.
@@ -254,7 +254,7 @@ The other solution is to not allow DrakX to modify the partition table.
 
 Do you agree to lose all the partitions?
 ", $dev, formatError($err)));
-        }) } sub { $in->ask_okcancel('', formatError($@)) };
+        }) } sub { $o_in->ask_okcancel('', formatError($@)) };
     } else {
 	catch_cdie { hds($flags) } sub { 1 }
     }
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 1773a9507..d21a6d9b9 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -948,10 +948,10 @@ sub use_root_part {
 }
 
 sub getHds {
-    my ($o, $in) = @_;
+    my ($o, $o_in) = @_;
 
   getHds: 
-    my $all_hds = fsedit::get_hds($o->{partitioning}, $in);
+    my $all_hds = fsedit::get_hds($o->{partitioning}, $o_in);
     my $hds = $all_hds->{hds};
 
     if (is_empty_array_ref($hds)) { #- no way
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 4ecdcfe25..25446b4d7 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -150,7 +150,7 @@ sub setupSCSI {
     modules::load_category('bus/firewire');
     modules::load_category('disk/scsi|hardware_raid|firewire');
 
-    install_any::getHds($o, $o);
+    install_any::getHds($o);
 }
 
 #------------------------------------------------------------------------------
-- 
cgit v1.2.1