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

[Maximilian Attems]

Author: maks
Date: Mon Jul 27 12:15:18 2009
New Revision: 14027

Log:
Nuke handling related to /initrd directory

the template is quite aged and thus we don't need to check for that.
first step in cleaning up the symlink mess.

Modified:
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/config
   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/config
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/config	Mon Jul 27 12:15:02 2009	(r14026)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/config	Mon Jul 27 12:15:18 2009	(r14027)
@@ -122,31 +122,6 @@
 elsif ($kimage =~ m/^vmlinux$/o)  { my $nop = $kimage;   }
 else                              { $kimage = "vmlinuz"; } # Default
 
-if (-d "$kimage" ) {
-  my $ret;
-  my $seen;
-  my $note = "${package_name}/postinst/kimage-is-a-directory";
-
-  ($ret,$seen) = fset ("$note", 'seen', 'false');
-  die "Error setting debconf flags in $note: $seen" if $ret;
-
-  $ret = subst("$note", 'kimage', "$kimage");
-  die "Error setting debconf substitutions in $note: $seen" if $ret;
-
-  $ret = subst("$note", 'image_dest', "$image_dest");
-  die "Error setting debconf substitutions in $note: $seen" if $ret;
-
-  ($ret,$seen) = input('critical', "$note");
-  if ($ret && $ret != 30 ) {
-    die "Error setting debconf note $note: $seen";
-  }
-
-  ($ret,$seen) = go ();
-  if ($ret && $ret != 30 ) {
-    die "Error asking debconf question $note: $seen";
-  }
-}
-
 if (! -e "$kimage" && ! $no_symlink && ! $reverse_symlink && 
     ! $have_conffile ) {
   my $ret;

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:15:02 2009	(r14026)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Mon Jul 27 12:15:18 2009	(r14027)
@@ -767,17 +767,6 @@
   warn "image_magic: kimage=$kimage, image_dest=$image_dest\n" .
     "\t image_name=$image_name, src_dir=$src_dir" if $DEBUG;
 
-  # Well, in any case, if the destination (the symlink we are trying
-  # to create) is a directory, we should do nothing, except throw a
-  # diagnostic.
-  if (-d "$kimage" ) {
-    die ("Hmm. $kimage is a directory, which I did not expect.  I am\n" .
-         "trying to create a symbolic link with that name linked to \n" .
-         "$image_dest . Since a directory exists here, my assumptions \n" .
-         "are way off, and I am aborting.\n" );
-    exit (3);
-  }
-
   if ($move_image) {   # Maybe $image_dest is in on dos, or something?
     #                   source dir,    link name,        dest dir
     really_move_image(  $realimageloc, $image_name, $image_dest);

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:15:02 2009	(r14026)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/templates	Mon Jul 27 12:15:18 2009	(r14027)
@@ -71,13 +71,6 @@
  installed image packages. This will be useful with some boot loaders
  such as LILO.
 
-Template: =ST-image-=V/postinst/kimage-is-a-directory
-Type: note
-Description: Image symbolic link destination is a directory, aborting
- ${kimage} is a directory, which is unepected. There is no method to
- handle that situation automatically and the kernel image
- installation has been aborted.
-
 Template: =ST-image-=V/postinst/depmod-error-initrd-=V
 Type: boolean
 Default: false