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

[Maximilian Attems]

Author: maks
Date: Mon Jul 27 12:13:41 2009
New Revision: 14019

Log:
postrm cleanup initramfs related variables

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

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm	Mon Jul 27 12:13:29 2009	(r14018)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm	Mon Jul 27 12:13:41 2009	(r14019)
@@ -48,8 +48,6 @@
 my $loader            = "=L";     # lilo, silo, quik, palo, vmelilo, or nettrom
 my $image_dir         = "=D";     # where the image is located
 my $clobber_modules   = '';       # target machine defined
-my $initrd            = "=I";     # initrd kernel
-my $mkimage           = "=M";        # command to generate the initrd image
 my $use_hard_links    = '';       # hardlinks do not work across fs boundaries
 my $postinst_hook     = '';       #Normally we do not
 my $postrm_hook       = '';       #Normally we do not
@@ -63,7 +61,6 @@
 my $arch              = "=A";  #  should be same as dpkg --print-installation-architecture
 my $kernel_arch       = "=B";
 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"; # 
@@ -153,8 +150,6 @@
       $postrm_hook     = "$1"  if /postrm_hook\s*=\s*(\S+)/ig;
       $preinst_hook    = "$1"  if /preinst_hook\s*=\s*(\S+)/ig;
       $prerm_hook      = "$1"  if /prerm_hook\s*=\s*(\S+)/ig;
-      $mkimage         = "$1"  if /mkimage\s*=\s*(.+)$/ig;
-      $ramdisk         = "$1"  if /ramdisk\s*=\s*(.+)$/ig;
     }
     close CONF;
     $have_conffile = "Yes";
@@ -349,8 +344,8 @@
   # check and remove damaged and dangling symlinks
   image_magic($kimage,          $image_dest);
   image_magic($kimage . ".old", $image_dest);
-  image_magic("initrd.img",     $image_dest) if $initrd;
-  image_magic("initrd.img.old", $image_dest) if $initrd;
+  image_magic("initrd.img",     $image_dest);
+  image_magic("initrd.img.old", $image_dest);
 }