From e856406c37faaf980f447132247483152a894f0d Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 1 Aug 2002 11:09:16 +0000
Subject: bootloader::suggest uses a hash for its options

---
 perl-install/bootloader.pm    | 8 ++++----
 perl-install/install_steps.pm | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index a94e4bd29..8eb91aed3 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -305,7 +305,7 @@ sub get_kernels_and_labels {
 }
 
 sub suggest {
-    my ($prefix, $lilo, $hds, $fstab, $vga_fb, $quiet) = @_;
+    my ($prefix, $lilo, $hds, $fstab, %options) = @_;
     my $root_part = fsedit::get_root($fstab);
     my $root = isLoopback($root_part) ? "loop7" : $root_part->{device};
     my $boot = fsedit::get_root($fstab, 'boot')->{device};
@@ -379,11 +379,11 @@ wait %d seconds for default boot.
     while (my ($ext, $version) = each %labels) {
 	my $entry = add_kernel($prefix, $lilo, $version, $ext, $root,
 	       {
-		if_($vga_fb && $ext eq '', vga => $vga_fb), #- using framebuffer
+		if_($options{vga_fb} && $ext eq '', vga => $options{vga_fb}), #- using framebuffer
 	       });
-	$entry->{append} .= " quiet" if $vga_fb && $version !~ /smp|enterprise/ && $quiet;
+	$entry->{append} .= " quiet" if $options{vga_fb} && $version !~ /smp|enterprise/ && $options{quiet};
 
-	if ($vga_fb && $ext eq '') {
+	if ($options{vga_fb} && $ext eq '') {
 	    add_kernel($prefix, $lilo, $version, $ext, $root, { label => 'linux-nonfb' });
 	}
     }
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index dddb5a67a..a7a0cf57c 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -839,7 +839,8 @@ sub setupBootloaderBefore {
 	    $p && $p->flag_installed;
 	} 'Aurora', 'bootsplash';
         bootloader::suggest($o->{prefix}, $o->{bootloader}, $o->{all_hds}{hds}, $o->{fstab},
-			    ($force_vga || $vga && $need_fb) && $o->{vga}, $o->{meta_class} ne 'server');
+			    vga_fb => ($force_vga || $vga && $need_fb) && $o->{vga}, 
+			    quiet => $o->{meta_class} ne 'server');
 	bootloader::suggest_floppy($o->{bootloader}) if $o->{security} <= 3 && arch() !~ /ppc/;
 
 	$o->{bootloader}{keytable} ||= keyboard::keyboard2kmap($o->{keyboard});
-- 
cgit v1.2.1