From 9466e5de86b12037e28cda626cb9650e4de0c777 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 26 Feb 2013 06:36:11 +0000
Subject: revert more rosa crap

---
 perl-install/standalone/bootloader-config | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'perl-install/standalone/bootloader-config')

diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index a9b94d477..cb7a13de8 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -61,7 +61,6 @@ if ($image) {
 my $all_hds = fsedit::get_hds();
 fs::get_info_from_fstab($all_hds);
 
-my $have_grub2 = -e "/boot/grub2/grub.cfg";
 my $bootloader;
 $bootloader = bootloader::read($all_hds);
 if (!$bootloader) {
@@ -89,12 +88,6 @@ sub remove_kernel() {
     unlink "/lib/modules/$kernel_version/source";
     remove_now_broken_boot_symlinks();
 
-    if ($have_grub2) {
-        system('grub2-mkconfig', '-o', '/boot/grub2/grub.cfg');
-        modify_bootloader();
-        return;
-    }
-
     if (!$bootloader) {
 	#- removing the initrd for weird configs where no mdv bootloader is configured
 	my $kernel_str = bootloader::vmlinuz2kernel_str($image) or die "bad kernel name $image\n";
@@ -166,16 +159,12 @@ sub add_kernel() {
 		(grep_each { member($::a, 'vga', 'lock') } %{$bootloader->{default_options}}),
 	       );
 
-    if ($have_grub2) {
-        system('grub2-mkconfig', '-o', '/boot/grub2/grub.cfg');
-    } else {
         #- short name
 	bootloader::add_kernel($bootloader, $kernel_str, { %opts }, 0, $no_initrd) if !$no_short_name;
 
         #- long name
 	$kernel_str->{use_long_name} = 1;
         bootloader::add_kernel($bootloader, $kernel_str, { %opts }, 1, $no_initrd);
-    }
 
     modify_bootloader();
 }
@@ -192,12 +181,6 @@ sub configure_ide_controller() {
 }
 
 sub modify_bootloader() {
-    if ($have_grub2) {
-        my $boot_partition = `df -h /boot |(read; awk '{print \$1; exit}'|sed 's/[[:digit:]]*\$//')`;
-        system('grub2-install', $boot_partition);
-        return;
-    }
-
     !$no_entry or return;
 
     bootloader::action($bootloader, 'write', $all_hds);
-- 
cgit v1.2.1