summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-05-25 11:22:16 +0000
committerFrancois Pons <fpons@mandriva.com>2000-05-25 11:22:16 +0000
commita5cbe2370666644c7728729ba948c7a6336566b8 (patch)
treeb75de99178b83fd925a0e9e81808cf2cc11be791 /perl-install/install_steps_interactive.pm
parent3817c0ae5ac9d2bd27f74d62cefb1336b6088657 (diff)
downloaddrakx-backup-do-not-use-a5cbe2370666644c7728729ba948c7a6336566b8.tar
drakx-backup-do-not-use-a5cbe2370666644c7728729ba948c7a6336566b8.tar.gz
drakx-backup-do-not-use-a5cbe2370666644c7728729ba948c7a6336566b8.tar.bz2
drakx-backup-do-not-use-a5cbe2370666644c7728729ba948c7a6336566b8.tar.xz
drakx-backup-do-not-use-a5cbe2370666644c7728729ba948c7a6336566b8.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm13
1 files changed, 7 insertions, 6 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 464ac7f2b..eac2a20f9 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -854,11 +854,11 @@ 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_("/boot/vmlinuz*") } ] },
-_("Partition") => { val => \$e->{partition}, list => [ map { ("/dev/$_->{device}" =~ /\D*(\d*)/)[0] || 1} @{$o->{fstab}} ], not_edit => !$::expert },
-_("Root") => { val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @{$o->{fstab}} ], not_edit => !$::expert },
+_("Image") => { val => \$e->{kernel_or_dev}, list => [ eval { 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 },
_("Append") => \$e->{append},
-_("Initrd") => { val => \$e->{initrd}, list => [ eval { glob_("/boot/initrd*") } ] },
+_("Initrd") => { val => \$e->{initrd}, list => [ eval { glob_("$o->{prefix}/boot/initrd*") } ] },
_("Read-write") => { val => \$e->{'read-write'}, type => 'bool' }
);
@l = @l[0..7] unless $::expert;
@@ -879,8 +879,9 @@ _("Default") => { val => \$default, type => 'bool' },
0;
})) {
$b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default};
-
- push @{$b->{entries}}, $e if $c eq "Add";
+ require silo;
+ silo::configure_entry($o->{prefix}, $e);
+ $c eq 'Add' and push @{$b->{entries}}, $e;
} else {
@{$b->{entries}} = grep { $_ != $e } @{$b->{entries}};
}