summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-06 05:16:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-06 05:16:56 +0000
commit0c3209bafe32f4dcf0c9dcd9c6053c2cee1d8733 (patch)
tree86b3d36cb1926e260b0c615540691ea125123290
parentdd14d019f7e3a18b6eb396d1ef25877ef4f0aa40 (diff)
downloaddrakx-0c3209bafe32f4dcf0c9dcd9c6053c2cee1d8733.tar
drakx-0c3209bafe32f4dcf0c9dcd9c6053c2cee1d8733.tar.gz
drakx-0c3209bafe32f4dcf0c9dcd9c6053c2cee1d8733.tar.bz2
drakx-0c3209bafe32f4dcf0c9dcd9c6053c2cee1d8733.tar.xz
drakx-0c3209bafe32f4dcf0c9dcd9c6053c2cee1d8733.zip
rename var
-rw-r--r--perl-install/bootloader.pm34
1 files changed, 17 insertions, 17 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 1fd1b39a1..719e7b887 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -972,31 +972,31 @@ sub write_lilo {
push @conf, map_each { "disk=$::a bios=$::b" } %{$bootloader->{bios}};
- foreach (@{$bootloader->{entries}}) {
- push @conf, "$_->{type}=" . $file2fullname->($_->{kernel_or_dev});
+ foreach my $entry (@{$bootloader->{entries}}) {
+ push @conf, "$entry->{type}=" . $file2fullname->($entry->{kernel_or_dev});
my @entry_conf;
- push @entry_conf, "label=" . make_label_lilo_compatible($_->{label});
-
- if ($_->{type} eq "image") {
- push @entry_conf, "root=$_->{root}" if $_->{root};
- push @entry_conf, "initrd=" . $file2fullname->($_->{initrd}) if $_->{initrd};
- push @entry_conf, qq(append="$_->{append}") if $_->{append};
- push @entry_conf, "vga=$_->{vga}" if $_->{vga};
- push @entry_conf, $_->{'read-write'} ? "read-write" : "read-only";
+ push @entry_conf, "label=" . make_label_lilo_compatible($entry->{label});
+
+ if ($entry->{type} eq "image") {
+ push @entry_conf, "root=$entry->{root}" if $entry->{root};
+ push @entry_conf, "initrd=" . $file2fullname->($entry->{initrd}) if $entry->{initrd};
+ push @entry_conf, qq(append="$entry->{append}") if $entry->{append};
+ push @entry_conf, "vga=$entry->{vga}" if $entry->{vga};
+ push @entry_conf, $entry->{'read-write'} ? "read-write" : "read-only";
} else {
- push @entry_conf, "table=$_->{table}" if $_->{table};
- push @entry_conf, "unsafe" if $_->{unsafe} && !$_->{table};
+ push @entry_conf, "table=$entry->{table}" if $entry->{table};
+ push @entry_conf, "unsafe" if $entry->{unsafe} && !$entry->{table};
- if ($_->{table}) {
- my $hd = fs::device2part($_->{table}, $hds);
+ if ($entry->{table}) {
+ my $hd = fs::device2part($entry->{table}, $hds);
if ($hd != $sorted_hds[0]) {
#- boot off the nth drive, so reverse the BIOS maps
my $nb = sprintf("0x%x", 0x80 + (find_index { $hd == $_ } @sorted_hds));
- $_->{mapdrive} ||= { '0x80' => $nb, $nb => '0x80' };
+ $entry->{mapdrive} ||= { '0x80' => $nb, $nb => '0x80' };
}
}
- if ($_->{mapdrive}) {
- push @entry_conf, map_each { "map-drive=$::a", " to=$::b" } %{$_->{mapdrive}};
+ if ($entry->{mapdrive}) {
+ push @entry_conf, map_each { "map-drive=$::a", " to=$::b" } %{$entry->{mapdrive}};
}
}
push @conf, map { "\t$_" } @entry_conf;