summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-06-20 16:25:33 +0000
committerFrancois Pons <fpons@mandriva.com>2000-06-20 16:25:33 +0000
commit7f7a9b7b58dbef59e2e1a09afe682983dc7806f8 (patch)
tree8b7d537f31d92c3ba63acf1a67dd73c58ea84ab8 /perl-install/install_steps_interactive.pm
parente61090daf9ed3cfcb837287cf6717161d1179bf5 (diff)
downloaddrakx-7f7a9b7b58dbef59e2e1a09afe682983dc7806f8.tar
drakx-7f7a9b7b58dbef59e2e1a09afe682983dc7806f8.tar.gz
drakx-7f7a9b7b58dbef59e2e1a09afe682983dc7806f8.tar.bz2
drakx-7f7a9b7b58dbef59e2e1a09afe682983dc7806f8.tar.xz
drakx-7f7a9b7b58dbef59e2e1a09afe682983dc7806f8.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm16
1 files changed, 9 insertions, 7 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 36a4ce526..00ed1b99c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -219,7 +219,7 @@ sub choosePartitionsToFormat($$) {
$o->SUPER::choosePartitionsToFormat($fstab);
my @l = grep { !$_->{isFormatted} && $_->{mntpoint} && !($::beginner && isSwap($_)) &&
- (!isFat($_) || $::expert || $_->{toFormat})
+ (!isOtherAvailableFS($_) || $::expert || $_->{toFormat})
} @$fstab;
$_->{toFormat} = 1 foreach grep { $::beginner && isSwap($_) } @$fstab;
@@ -801,7 +801,7 @@ sub setupSILO {
if ($::beginner && $more == 1) {
#- nothing more to do here.
} elsif ($more || !$::beginner) {
- $o->set_help("setupBootloaderGeneral");
+ $o->set_help("setupSILOGeneral");
$::expert and $o->ask_yesorno('', _("Do you want to use SILO?"), 1) || return;
@@ -825,7 +825,7 @@ _("Restrict command line options") => { val => \$b->{restricted}, type => "bool"
}
until ($::beginner && $more <= 1) {
- $o->set_help('setupBootloaderAddEntry');
+ $o->set_help('setupSILOAddEntry');
my $c = $o->ask_from_list_([''],
_("Here are the following entries in SILO.
You can add some more or change the existing ones."),
@@ -854,16 +854,18 @@ You can add some more or change the existing ones."),
my @l;
if ($e->{type} eq "image") {
@l = (
-_("Image") => { val => \$e->{kernel_or_dev}, list => [ eval { glob_("$o->{prefix}/boot/vmlinuz*") } ] },
+_("Image") => { val => \$e->{kernel_or_dev}, list => [ eval { map { s/$o->{prefix}//; $_ } glob_("$o->{prefix}/boot/vmlinuz*") } ] },
_("Partition") => { val => \$e->{partition}, list => [ map { ("$o->{prefix}/dev/$_->{device}" =~ /\D*(\d*)/)[0] || 1} @{$o->{fstab}} ], not_edit => !$::expert },
-_("Root") => { val => \$e->{root}, list => [ map { "$o->{prefix}/dev/$_->{device}" } @{$o->{fstab}} ], not_edit => !$::expert },
+_("Root") => { val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @{$o->{fstab}} ], not_edit => !$::expert },
_("Append") => \$e->{append},
-_("Initrd") => { val => \$e->{initrd}, list => [ eval { glob_("$o->{prefix}/boot/initrd*") } ] },
+_("Initrd") => { val => \$e->{initrd}, list => [ eval { map { s/$o->{prefix}//; $_ } glob_("$o->{prefix}/boot/initrd*") } ] },
_("Read-write") => { val => \$e->{'read-write'}, type => 'bool' }
);
@l = @l[0..7] unless $::expert;
} else {
- die "Other SILO entries not supported at the moment";
+ @l = (
+_("Root") => { val => \$e->{kernel_or_dev}, list => [ map { "/dev/$_->{device}" } @{$o->{fstab}} ], not_edit => !$::expert },
+ );
}
@l = (
_("Label") => \$e->{label},