From 6b69393d2b0c2911f486ca6c0046ccf6e1a3f238 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 18 Aug 2000 05:44:25 +0000
Subject: no_comment

---
 perl-install/install_steps_interactive.pm | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'perl-install/install_steps_interactive.pm')

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index ca54f9d87..2804f3f19 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -176,7 +176,7 @@ sub setupSCSI {
 	my $w = $o->wait_message(_("IDE"), _("Configuring IDE"));
 	modules::load_ide();
     }
-    install_interactive::setup_thiskind($o, 'scsi|raid', $_[1], $_[2]);
+    install_interactive::setup_thiskind($o, 'scsi|disk', $_[1], $_[2]);
 }
 
 sub ask_mntpoint_s {
@@ -188,19 +188,13 @@ sub ask_mntpoint_s {
 
     if (@fstab == 1) {
 	$fstab[0]{mntpoint} = '/';
-    } elsif ($::beginner) {
-	my $e = $o->ask_from_listf('', 
-				   _("Please choose a partition to use as your root partition."), 
-				   \&partition_table_raw::description,
-				   \@fstab) or return;
-	(fsedit::get_root($fstab) || {})->{mntpoint} = '';
-	$e->{mntpoint} = '/';
     } else {
+	install_any::suggest_mount_points($o->{hds}, $o->{prefix});
 	$o->ask_from_entries_refH('', 
 				  _("Choose the mount points"),
-				  { map { partition_table_raw::description($_) => 
+				  [ map { partition_table_raw::description($_) => 
 				            { val => \$_->{mntpoint}, list => [ '', fsedit::suggestions_mntpoint([]) ] }
-					} @fstab }) or return;
+					} @fstab ]) or return;
     }
     $o->SUPER::ask_mntpoint_s($fstab);
 }
-- 
cgit v1.2.1