summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-18 05:44:25 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-18 05:44:25 +0000
commit6b69393d2b0c2911f486ca6c0046ccf6e1a3f238 (patch)
treed0f131da5b1d5ae7f370b0cd3411242eee1a7990 /perl-install/install_steps_interactive.pm
parent94f257d030c1fd411ec48e438db18c657cd97e40 (diff)
downloaddrakx-6b69393d2b0c2911f486ca6c0046ccf6e1a3f238.tar
drakx-6b69393d2b0c2911f486ca6c0046ccf6e1a3f238.tar.gz
drakx-6b69393d2b0c2911f486ca6c0046ccf6e1a3f238.tar.bz2
drakx-6b69393d2b0c2911f486ca6c0046ccf6e1a3f238.tar.xz
drakx-6b69393d2b0c2911f486ca6c0046ccf6e1a3f238.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm14
1 files changed, 4 insertions, 10 deletions
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);
}