From 04a060ad1793bf80c7bfbaaf784d8d3b669ad83a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 24 Jan 2002 13:02:17 +0000
Subject: ensure grub is installed if grub is chosen

---
 perl-install/any.pm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/perl-install/any.pm b/perl-install/any.pm
index cd1438d56..04ed13e32 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -82,6 +82,13 @@ sub enableMD5Shadow { #- NO MORE USED
     } grep { -r $_ } map { "$prefix/etc/pam.d/$_" } qw(login rlogin passwd);
 }
 
+sub grub_installed {
+    my ($in) = @_;
+    my $f = "/usr/sbin/grub";
+    $in->do_pkgs->install('grub') if !-e $f;
+    -e $f;
+}
+
 sub setupBootloader {
     my ($in, $b, $all_hds, $fstab, $security, $prefix, $more) = @_;
     my $hds = $all_hds->{hds};
@@ -196,6 +203,9 @@ sub setupBootloader {
 	
 	$b->{methods}{$_} = 0 foreach keys %{$b->{methods}};
 	$bootloaders{$bootloader} and $bootloaders{$bootloader}->();
+
+	grub_installed($in) or return 1 if $b->{methods}{grub};
+
 	#- at least one method
 	grep_each { $::b } %{$b->{methods}} or return 0;
 
-- 
cgit v1.2.1