1 files changed, 23 insertions, 27 deletions

diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index 99bc5409e..187ca3eed 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -54,19 +54,7 @@ if ($image) {
     }
     $image = "/boot/$image" if $image !~ m!^/!;
 } elsif ($kernel_version) {
-    # FIXME : test for vmlinux or vmlinuz existence and choose
-    # instead of using arch()
-    if (arch() =~ /mips/) {
-	$image = "/boot/vmlinux-$kernel_version";
-    } elsif (arch() =~ /arm/) {
-	if ($kernel_version =~ /versatile/) {
-	    $image = "/boot/vmlinuz-$kernel_version";
-	} else {
-	    $image = "/boot/uImage-$kernel_version";
-	}
-    } else {
-    	$image = "/boot/vmlinuz-$kernel_version";
-    }
+    $image = find { -e $_ } map { "/boot/$_-$kernel_version" } qw(vmlinux uImage vmlinuz);
 }
 
 
@@ -76,6 +64,9 @@ fs::get_info_from_fstab($all_hds);
 my $bootloader = bootloader::read($all_hds);
 if (!$bootloader) {
     if (member($action, 'add-kernel', 'remove-kernel')) {
+	if ($no_initrd) {
+	    die "Cannot find a bootloader installed and initrd build suppressed\n";
+	}
 	warn "Cannot find a boot loader installed. Only taking care of initrd\n";
     } else {
 	die "Cannot find a boot loader installed\n";
@@ -100,13 +91,19 @@ sub remove_kernel() {
     remove_now_broken_boot_symlinks();
 
     if (!$bootloader) {
-	#- removing the initrd for weird configs where no mdv bootloader is configured
+	#- removing the initrd for weird configs where no mga bootloader is configured
 	my $kernel_str = bootloader::vmlinuz2kernel_str($image) or die "bad kernel name $image\n";
 	my $initrd_long = bootloader::kernel_str2initrd_long($kernel_str);
 	unlink "/boot/$initrd_long";
 	return;
     }
 
+    remove_kernel_generic() if bootloader::main_method($bootloader->{method}) ne 'grub2';
+
+    modify_bootloader();
+}
+
+sub remove_kernel_generic() {
     my %proposed_labels;
     my @new_entries;
 
@@ -141,45 +138,44 @@ sub remove_kernel() {
 	my ($kernel_str, $v) = @$_;
 	bootloader::add_kernel($bootloader, $kernel_str, $v);
     }
-
-    modify_bootloader();
 }    
 
 
 #-###############################################################################
 sub add_kernel() {
     configure_ide_controller();
-    bootloader::create_link_source();
 
     my $kernel_str = bootloader::vmlinuz2kernel_str($image) or die "bad kernel name $image\n";
 
     if (!$bootloader) {
-	#- building the initrd for weird configs where no mdv bootloader is configured
+	#- building the initrd for weird configs where no mga bootloader is configured
 	my $fake_bootloader = { vga => undef };
 	my %opts = (initrd_options => $initrd_options);
 	my $initrd_long = bootloader::kernel_str2initrd_long($kernel_str);
-	bootloader::mkinitrd($kernel_str->{version}, $fake_bootloader, { %opts }, "/boot/$initrd_long");
+	bootloader::mkinitrd($kernel_str->{version}, $fake_bootloader, \%opts, "/boot/$initrd_long");
 	return;
     }
 
-    my $root_part = fs::get::root([ fs::get::fstab($all_hds) ]) or die "cannot find root partition\n";
+    my $root_part = fs::get::root_([ fs::get::fstab($all_hds) ]) or warn "cannot find root partition in /etc/fstab\n";
+    $root_part ||= fs::get::root_from_mounted() or die "cannot find root partition\n";
     my %opts = (
 		root => fs::wild_device::from_part('', $root_part), 
 		initrd_options => $initrd_options,
 		if_($label, label => $label),
 		(grep_each { member($::a, 'vga', 'lock') } %{$bootloader->{default_options}}),
 	       );
-    #- 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);
+        #- 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();
 }
 
-sub configure_ide_controller {
+sub configure_ide_controller() {
     my $modules_conf = modules::any_conf->read;
     if ($modules_conf->get_alias('ide-controller') || 
         $modules_conf->get_probeall('ide-controller')) {
@@ -281,7 +277,7 @@ sub migrate_to_uuids() {
     }
 }
 
-sub _migrate_to_uuids__fstab() {
+sub _migrate_to_uuids__fstab {
     my ($fstab) = @_;
 
     my @raw_fstab = fs::read_fstab('', '/etc/fstab', 'keep_freq_passno', 'verbatim_credentials');