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

[Maximilian Attems]

Author: maks
Date: Mon Jul 27 12:13:29 2009
New Revision: 14018

Log:
postinst nuke useless depmod-error template

as we always ship an initramfs that code path,
was never executed and thus is useless for us, nuke it.

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

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Mon Jul 27 12:13:11 2009	(r14017)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Mon Jul 27 12:13:29 2009	(r14018)
@@ -896,15 +896,10 @@
   my $signal_num  = $? & 127;
   my $dumped_core = $? & 128;
   if ($ret) {
-    if ( -f "$modules_base/$version/modules.dep") {
-      unlink "$modules_base/$version/modules.dep" unless $initrd;
-    }
     my $seen;
     my $answer;
-    my $question = "${package_name}/postinst/depmod-error-$version";
-    if ($initrd) {
-      $question = "${package_name}/postinst/depmod-error-initrd-$version";
-    }
+    $question = "${package_name}/postinst/depmod-error-initrd-$version";
+
     ($ret,$seen) = fset ("$question", 'seen', 'false');
     die "Error setting debconf flags in $question: $seen" if $ret;
 

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/templates
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/templates	Mon Jul 27 12:13:11 2009	(r14017)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/templates	Mon Jul 27 12:13:29 2009	(r14018)
@@ -78,18 +78,6 @@
  handle that situation automatically and the kernel image
  installation has been aborted.
 
-Template: =ST-image-=V/postinst/depmod-error-=V
-Type: boolean
-Default: false
-Description: Abort installation after depmod error?
- The 'depmod' command exited with the exit code ${exit_value}
- (${SIGNAL}${CORE}).
- .
- This may be benign, for instance because of versioned symbol names.
- .
- Please choose whether the installation should be aborted or the error
- just ignored.
-
 Template: =ST-image-=V/postinst/depmod-error-initrd-=V
 Type: boolean
 Default: false