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

[Maximilian Attems]

Author: maks
Date: Mon Jul 27 12:12:33 2009
New Revision: 14015

Log:
preinst do initrd by default

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

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst	Mon Jul 27 12:12:07 2009	(r14014)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst	Mon Jul 27 12:12:33 2009	(r14015)
@@ -33,13 +33,11 @@
 my $do_bootfloppy   = "Yes";	# target machine defined
 my $do_bootloader   = "Yes";	# target machine defined
 my $move_image      = '';       # target machine defined
-my $mkimage         = "=M";     # command to generate the initrd image
 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 $initrd          = "=I";     # initrd kernel
 my $use_hard_links  = '';       # hardlinks do not wirk across fs boundaries
 my $postinst_hook   = '';       #Normally we do not
 my $postrm_hook     = '';       #Normally we do not
@@ -153,7 +151,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;
@@ -180,17 +177,10 @@
 	return @ramdisks;
 }
 
-# For some versions of kernel-package, we had this warning in the
-# postinst, but the rules did not really interpolate the value in.
-# Here is a sanity check.
-my $pattern = "=" . "I";
-$initrd=~ s/^$pattern$//;
-
-if ($initrd) {
-  chomp (my $hostversion = `uname -r`);
-  my @ramdisklist;
-  @ramdisklist = find_inird_tool($ramdisk) if $ramdisk;
-  if ($#ramdisklist < 0) {
+chomp (my $hostversion = `uname -r`);
+my @ramdisklist;
+ at ramdisklist = find_inird_tool($ramdisk) if $ramdisk;
+if ($#ramdisklist < 0) {
     my $ret;
     my $seen;
     my $text = "${package_name}/preinst/initrd-$version";
@@ -219,7 +209,6 @@
     ($ret,$seen) = unregister("$text");
     die "Error unregistering debconf question $text: $seen" if $ret;
     warn "Could not find $ramdisk.";
-  }
 }