From 3c7cb82f14dd81be43676dc32db757f13e3eea7c Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 27 Jul 2009 12:15:49 +0000 Subject: [PATCH] preinst cleanup unused loader variables preinst doesn't run any bootloader, so no need to have any related code around. svn path=/dists/trunk/linux-2.6/; revision=14029 --- debian/templates/temp.image.plain/preinst | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/debian/templates/temp.image.plain/preinst b/debian/templates/temp.image.plain/preinst index 243ac5466..9ca4822e2 100755 --- a/debian/templates/temp.image.plain/preinst +++ b/debian/templates/temp.image.plain/preinst @@ -29,12 +29,8 @@ my $link_in_boot = "=IB"; # Should be empty, mostly my $no_symlink = "=S"; # Should be empty, mostly my $reverse_symlink = "=R"; # Should be empty, mostly my $do_symlink = "Yes"; # target machine defined -my $do_boot_enable = "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 - # or elilo my $image_dir = "=D"; # where the image is located my $clobber_modules = ''; # target machine defined my $use_hard_links = ''; # hardlinks do not wirk across fs boundaries @@ -54,18 +50,6 @@ my $ramdisk = "=MK"; # List of tools to create initial ram fs. my $initrddep = "=MD"; # List of dependencies for such tools 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; - - #known variables my @boilerplate = (); my @silotemplate = (); @@ -82,7 +66,6 @@ my $have_conffile = ""; my $CONF_LOC = '/etc/kernel-img.conf'; my $relative_links = ''; my $silent_modules = ''; -my $silent_loader = ''; my $modules_base = '/lib/modules'; @@ -113,12 +96,9 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { $link_in_boot = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/ig; $move_image = "" if /move_image\s*=\s*(no|false|0)\s*$/ig; $clobber_modules = '' if /clobber_modules\s*=\s*(no|false|0)\s*$/ig; - $do_boot_enable = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/ig; - $do_bootloader = '' if /do_bootloader\s*=\s*(no|false|0)\s*$/ig; $relative_links = '' if /relative_links \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; @@ -131,12 +111,9 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { $link_in_boot = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/ig; $move_image = "Yes" if /move_image\s*=\s*(yes|true|1)\s*$/ig; $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_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;