summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-24 08:53:00 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-24 08:53:00 +0000
commit2d4133ff240757edb14cf10b83bbbabb274772f3 (patch)
treeadbdd0c33b5ff160ed5a1eb80cdb47837c7e0b45 /perl-install/install_steps_interactive.pm
parent0925f92586a8a200a632eece658b2a45b09c9cc8 (diff)
downloaddrakx-2d4133ff240757edb14cf10b83bbbabb274772f3.tar
drakx-2d4133ff240757edb14cf10b83bbbabb274772f3.tar.gz
drakx-2d4133ff240757edb14cf10b83bbbabb274772f3.tar.bz2
drakx-2d4133ff240757edb14cf10b83bbbabb274772f3.tar.xz
drakx-2d4133ff240757edb14cf10b83bbbabb274772f3.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm22
1 files changed, 15 insertions, 7 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 54812c39e..ceaa42380 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -579,15 +579,19 @@ _("Restrict command line options") => { val => \$b->{restricted}, type => "bool"
my $c = $o->ask_from_list_('',
_("Here are the following entries in lilo
You can add some more or change the existent ones."),
- [ (map_each{ "$::b->{label} ($::a)" . ($b->{default} eq $::b->{label} && " *") } %{$b->{entries}}), __("Add"), __("Done") ],
+ [ (sort @{[map_each { "$::b->{label} ($::a)" . ($b->{default} eq $::b->{label} && " *") } %{$b->{entries}}]}), __("Add"), __("Done") ],
);
$c eq "Done" and last;
- if ($c eq "Add") { }
+ my $e = {};
+ my $name = '';
- my ($name) = $c =~ /\((.*?)\)/;
- my $e = $b->{entries}{$name};
- my $default = $e->{label} eq $b->{default};
+ if ($c ne "Add") {
+ ($name) = $c =~ /\((.*?)\)/;
+ $e = $b->{entries}{$name};
+ }
+ my $old_name = $name;
+ my $default = my $old_default = $e->{label} eq $b->{default};
my @l;
if ($e->{type} eq "image") {
@@ -602,6 +606,7 @@ _("Read-write") => { val => \$e->{'read-write'}, type => 'bool' }
} else {
@l = (
_("Root") => { val => \$name, list => [ map { "/dev/$_->{device}" } @{$o->{fstab}} ], not_edit => !$::expert },
+_("Table") => { val => \$e->{table}, list => [ map { "/dev/$_->{device}" } @{$o->{hds}} ], not_edit => !$::expert },
_("Unsafe") => { val => \$e->{unsafe}, type => 'bool' }
);
@l = @l[0..1] if $::beginner;
@@ -618,7 +623,10 @@ _("Default") => { val => \$default, type => 'bool' },
[ grep_index { odd($::i) } @l ],
) or return;
- $b->{default} = $default && $e->{label};
+ $b->{default} = $old_default ^ $default ? $default && $e->{label} : $b->{default};
+
+ delete $b->{entries}{$old_name};
+ $b->{entries}{$name} = $e;
}
$o->SUPER::setupBootloader;
}
@@ -637,7 +645,7 @@ Remove the boot media and press return to reboot.
For information on fixes which are available for this release of Linux Mandrake,
consult the Errata available from http://www.linux-mandrake.com/.
Information on configuring your system is available in the post
-install chapter of the Official Linux Mandrake User's Guide."));
+install chapter of the Official Linux Mandrake User's Guide.")) if $alldone;
}