From 4bd781f6e202843da54aaf50e4ff8bdf67a8b8cf Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 19 Jul 2004 06:52:03 +0000
Subject: also add long name when adding add short name

---
 perl-install/standalone/bootloader-config | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index 6e473a915..56245dcd3 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -99,16 +99,20 @@ sub add_kernel() {
     bootloader::create_link_source();
 
     my $kernel_str = bootloader::vmlinuz2kernel_str($image);
-    $kernel_str->{use_long_name} = $no_short_name;
 
     my $root_part = fsedit::get_root([ fsedit::get_fstab(@$hds) ]);
-    bootloader::add_kernel($bootloader, $kernel_str, 
-			   { 
-			    root => "/dev/$root_part->{device}", 
-			    initrd_options => $initrd_options,
-			    if_($label, label => $label),
-			    if_($bootloader->{default_vga}, vga => $bootloader->{default_vga}),
-			   }, $no_short_name, $no_initrd);
+    my %opts = (
+		root => "/dev/$root_part->{device}", 
+		initrd_options => $initrd_options,
+		if_($label, label => $label),
+		if_($bootloader->{default_vga}, vga => $bootloader->{default_vga}),
+	       );
+    #- 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();
 }
-- 
cgit v1.2.1