From 44e50eaf2d9a98e51f5fbe71c57e54be2f97b893 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 5 Aug 2004 04:27:35 +0000
Subject: adapt to bootloader functions now using all_hds instead of hds

---
 perl-install/Xconfig/various.pm           | 2 +-
 perl-install/any.pm                       | 5 ++---
 perl-install/diskdrake/interactive.pm     | 2 +-
 perl-install/install_any.pm               | 2 +-
 perl-install/install_steps.pm             | 2 +-
 perl-install/standalone/bootloader-config | 9 ++++-----
 6 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm
index 98ea8fd2f..3a961aa7d 100644
--- a/perl-install/Xconfig/various.pm
+++ b/perl-install/Xconfig/various.pm
@@ -137,7 +137,7 @@ sub configure_FB_TVOUT {
 	
 	if (my $tvout = bootloader::duplicate_kernel_entry($bootloader, 'TVout')) {
 	    $tvout->{append} .= " XFree=tvout";
-	    bootloader::install($bootloader, $all_hds->{hds});
+	    bootloader::install($bootloader, $all_hds);
 	}
     }
 }
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 823f0fdec..454b6fa02 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -80,7 +80,6 @@ sub hdInstallPath() {
 
 sub setupBootloader {
     my ($in, $b, $all_hds, $fstab, $security) = @_;
-    my $hds = $all_hds->{hds};
 
     require bootloader;
   general:
@@ -88,7 +87,7 @@ sub setupBootloader {
 	local $::Wizard_no_previous = 1 if $::isStandalone;
 	setupBootloader__general($in, $b, $all_hds, $fstab, $security) or return 0;
     }
-    setupBootloader__boot_bios_drive($in, $b, $hds) or goto general;
+    setupBootloader__boot_bios_drive($in, $b, $all_hds->{hds}) or goto general;
     {
 	local $::Wizard_finished = 1 if $::isStandalone;
 	setupBootloader__entries($in, $b, $all_hds, $fstab) or goto general;
@@ -99,7 +98,7 @@ sub setupBootloader {
 
     eval { run_program::rooted($::prefix, 'lilo', '-u') } if $::isInstall && !$::o->{isUpgrade} && -e "$::prefix/etc/lilo.conf" && glob("$::prefix/boot/boot.*");
 
-    bootloader::install($b, $hds);
+    bootloader::install($b, $all_hds);
 }
 
 
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 0a0e5cd6b..f5b2524b0 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -1291,5 +1291,5 @@ sub update_bootloader_for_renumbered_partitions {
     my @renumbering = map { @{$_->{allPartitionsRenumbered} || []} } @{$all_hds->{hds}} or return;
 
     require bootloader;
-    bootloader::update_for_renumbered_partitions($in, \@renumbering, $all_hds->{hds});
+    bootloader::update_for_renumbered_partitions($in, \@renumbering, $all_hds);
 }
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 5b5b5e32f..557f31c9f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -637,7 +637,7 @@ sub setupFB {
     foreach (@{$o->{bootloader}{entries}}) {
 	$_->{vga} = $vga if $_->{vga}; #- replace existing vga= with
     }
-    bootloader::install($o->{bootloader}, $o->{all_hds}{hds});
+    bootloader::install($o->{bootloader}, $o->{all_hds});
     1;
 }
 
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 3fc191b9a..dcf215658 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -840,7 +840,7 @@ sub setupBootloader {
     my ($o) = @_;
 
     require bootloader;
-    bootloader::install($o->{bootloader}, $o->{all_hds}{hds});
+    bootloader::install($o->{bootloader}, $o->{all_hds});
 }
 
 #------------------------------------------------------------------------------
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index 55be9fb51..b6bec9dd6 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -55,7 +55,6 @@ if ($image) {
 
 my $all_hds = fsedit::get_hds();
 fs::get_info_from_fstab($all_hds, '');
-my $hds = $all_hds->{hds};
 
 my $bootloader = bootloader::read([ fs::get::fstab($all_hds) ]) or die "Cannot find a boot loader installed\n";
 
@@ -120,8 +119,8 @@ sub add_kernel() {
 sub modify_bootloader() {
     !$no_entry or return;
 
-    bootloader::action($bootloader, 'write', $hds);
-    bootloader::action($bootloader, 'when_config_changed', $hds) if !$no_launch;
+    bootloader::action($bootloader, 'write', $all_hds);
+    bootloader::action($bootloader, 'when_config_changed') if !$no_launch;
 }
 
 #-###############################################################################
@@ -156,14 +155,14 @@ sub update_splash() {
     foreach (@{$bootloader->{entries}}) {
 	bootloader::add_boot_splash($_->{initrd}, $_->{vga}) if $_->{initrd};
     }
-    bootloader::action($bootloader, 'when_config_changed', $hds) if !$no_launch;
+    bootloader::action($bootloader, 'when_config_changed') if !$no_launch;
 }
 
 sub remove_splash() {
     foreach (@{$bootloader->{entries}}) {
 	bootloader::remove_boot_splash($_->{initrd}) if $_->{initrd};
     }
-    bootloader::action($bootloader, 'when_config_changed', $hds) if !$no_launch;
+    bootloader::action($bootloader, 'when_config_changed') if !$no_launch;
 }
 
 sub detectloader() {
-- 
cgit v1.2.1