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;
s='nohover-highlight'>| | | | | | | | (to have dir_index & resize_inode features) (cf Frederik Himpe 23 Apr 2007 mail on cooker: "Installer does not create ext3 partitions with dir_index and resize_inode?") * re-sync after the big svn lossPascal Rigaux2007-05-140-0/+0 | * re-sync after the big svn lossPascal Rigaux2007-05-142-0/+0 | * re-sync after the big svn lossPascal Rigaux2007-05-14142-0/+0 | * re-sync after the big svn lossPascal Rigaux2007-05-144-0/+681 | * re-sync after the big svn lossPascal Rigaux2007-05-1417-0/+45 | * - do not ask for updates at end of installation when updates are alreadyPascal Rigaux2007-05-092-0/+8 | | | | | available (network installs) (#30344) * build pcmcia header only on i386/x86_64 (patch from Pixel, #30668)Olivier Blin2007-05-092-3/+4 | * - localedrake:Pascal Rigaux2007-05-092-1/+3 | | | | | o don't call grub-gfxmenu when used by simple user * upJosé Melo2007-05-071-56/+9 | * upJosé Melo2007-05-071-92/+60 | * upJosé Melo2007-05-071-41/+15 | * create udev nodes configuration file in /etc/udev/devices.d/ instead of ↵Olivier Blin2007-04-302-3/+4 | | | | conf.d (used for modem and mouse) * do not try to configure dvd devices during install since /dev is wiped out ↵Olivier Blin2007-04-304-17/+2 | | | | at reboot * use ->last_usable_sector instead of {totalsectors} so that resizing aPascal Rigaux2007-04-301-1/+1 | | | | | | partition doesn't propose a partition size bigger than what creating a partition propose (#21709) * "Free space" is better than "Empty space"Pascal Rigaux2007-04-291-1/+1 | | | | | | (and we already use "free space" at other places) (thanks to Funda Wang) * - allow umounting cdrom during a transactionPascal Rigaux2007-04-272-0/+2 | * use full buffer size when snprintfing (gb)Olivier Blin2007-04-251-1/+1 | * 1.8Olivier Blin2007-04-252-1/+4 | * use api.mandriva.com to retrieve mirror list (#29346)Olivier Blin2007-04-252-117/+82 | * implement ask_from_list_index() and drop other ask_from_list() functionsOlivier Blin2007-04-252-45/+23 | * add generic ask_from_list_comments() and ask_from_list() implementation ↵Olivier Blin2007-04-251-0/+19 | | | | using the index returned by ask_from_list_index() * add ask_from_list_index() prototypeOlivier Blin2007-04-251-0/+1 | * add lowercase() function (used to retrieve mirror list)Olivier Blin2007-04-252-0/+10 | * remove huge unwanted commitOlivier Blin2007-04-258-137/+165 | * crappy commit (reverted later)Olivier Blin2007-04-258-165/+137 | * pass DISTRIB_TYPE when building stage1 (useful to know which mirro list to ↵Olivier Blin2007-04-252-1/+2 | | | | retrieve) * re-sync after the big svn lossPascal Rigaux2007-04-251-715/+100 | * re-sync after the big svn lossPascal Rigaux2007-04-25