[kernel] r14023 - dists/trunk/linux-2.6/debian/templates/temp.image.plain

[Maximilian Attems]

Author: maks
Date: Mon Jul 27 12:14:25 2009
New Revision: 14023

Log:
config doesn't invoke any boot loader

nuke related boot loader search code and related variables.

Modified:
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/config

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/config
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/config	Mon Jul 27 12:14:14 2009	(r14022)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/config	Mon Jul 27 12:14:25 2009	(r14023)
@@ -27,10 +27,8 @@
 my $do_symlink        = "Yes";  # target machine defined
 my $do_boot_enable    = "Yes";  # target machine defined
 my $do_bootfloppy     = "Yes";  # target machine defined
-my $do_bootloader     = "Yes";  # target machine defined
 my $move_image        = '';     # target machine defined
 my $kimage            = "=K";   # Should be empty, mostly
-my $loader            = "=L"; # lilo, silo, quik, palo, vmelilo, nettrom, arcboot or delo
 my $image_dir         = "=D";        # where the image is located
 my $clobber_modules   = '';          # target machine defined
 my $relative_links    = "";          # target machine defined
@@ -49,25 +47,11 @@
 my $kernel_arch       = "=B";
 my $package_name    = "=ST-image-$version";
 
-my $Loader          = "NoLOADER"; #
-$Loader             = "LILO"     if $loader =~ /^lilo/io;
-$Loader             = "SILO"     if $loader =~ /^silo/io;
-$Loader             = "QUIK"     if $loader =~ /^quik/io;
-$Loader             = "yaboot"   if $loader =~ /^yaboot/io;
-$Loader             = "PALO"     if $loader =~ /^palo/io;
-$Loader             = "NETTROM"  if $loader =~ /^nettrom/io;
-$Loader             = "VMELILO"  if $loader =~ /^vmelilo/io;
-$Loader             = "ZIPL"     if $loader =~ /^zipl/io;
-$Loader             = "ELILO"    if $loader =~ /^elilo/io;
-$Loader             = "ARCBOOT"  if $loader =~ /^arcboot/io;
-$Loader             = "DELO"     if $loader =~ /^delo/io;
-
 #known variables
 my $image_dest      = "/";
 my $realimageloc    = "/$image_dir/";
 my $have_conffile   = "";
 my $silent_modules  = '';
-my $silent_loader   = '';
 my $modules_base    = '/lib/modules';
 my $CONF_LOC        = '/etc/kernel-img.conf';
 
@@ -96,10 +80,8 @@
       $do_boot_enable  = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/ig;
       $do_bootfloppy   = '' if /do_bootfloppy\s*=\s*(no|false|0)\s*$/ig;
       $relative_links  = '' if /relative_links \s*=\s*(no|false|0)\s*$/ig;
-      $do_bootloader   = '' if /do_bootloader\s*=\s*(no|false|0)\s*$/ig;
       $use_hard_links  = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/ig;
       $silent_modules  = '' if /silent_modules\s*=\s*(no|false|0)\s*$/ig;
-      $silent_loader   = '' if /silent_loader\s*=\s*(no|false|0)\s*$/ig;
       $minimal_swap    = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/ig;
       $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/ig;
       $relink_src_link   = '' if /relink_src_link\s*=\s*(no|false|0)\s*$/ig;
@@ -115,11 +97,9 @@
       $clobber_modules = "Yes" if /clobber_modules\s*=\s*(yes|true|1)\s*$/ig;
       $do_boot_enable  = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/ig;
       $do_bootfloppy   = "Yes" if /do_bootfloppy\s*=\s*(yes|true|1)\s*$/ig;
-      $do_bootloader   = "Yes" if /do_bootloader\s*=\s*(yes|true|1)\s*$/ig;
       $relative_links  = "Yes" if /relative_links\s*=\s*(yes|true|1)\s*$/ig;
       $use_hard_links  = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/ig;
       $silent_modules  = 'Yes' if /silent_modules\s*=\s*(yes|true|1)\s*$/ig;
-      $silent_loader   = 'Yes' if /silent_loader\s*=\s*(yes|true|1)\s*$/ig;
       $minimal_swap    = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/ig;
       $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/ig;
       $relink_src_link   = 'Yes' if /relink_src_link\s*=\s*(yes|true|1)\s*$/ig;
@@ -159,12 +139,6 @@
 elsif ($kimage =~ m/^vmlinux$/o)  { my $nop = $kimage;   }
 else                              { $kimage = "vmlinuz"; } # Default
 
-# search for the boot loader in the path
-my $loader_exec;
-($loader_exec = $loader)  =~ s|.*/||;
-my ($loaderloc) = grep -x, map "$_/$loader_exec",
-  map { length($_) ? $_ : "." }  split /:/, $ENV{PATH};
-
 if (-d "$kimage" ) {
   my $ret;
   my $seen;