Re: piupart failure on preinst

[maximilian attems <max@stro.at>]

On Thu, 23 Jul 2009, maximilian attems wrote:

> On Thu, 23 Jul 2009, maximilian attems wrote:
> 
> > as bonus linux-2.6 images are easily installed in chroots
> > without stupid do_initrd set in /etc/kernel-img.conf
> > also gets rid of 4 ambigous debconf templates.
> > 
> 
> as follow up the old-initrd-link template and friends seems also quite aged,
> will axe too. we shouldn't care anymore about that legacy.
> 

while doing more little cleanup i came to another bigger one,
that seems also very aged, when according to Manoj initrd,
where put into /initrd.

so ready to be axed too, see below:


diff --git a/linux-2.6/debian/templates/temp.image.plain/config b/linux-2.6/debian/templates/temp.image.plain/config
index ad0ac8d..0c7f30d 100755
--- a/linux-2.6/debian/templates/temp.image.plain/config
+++ b/linux-2.6/debian/templates/temp.image.plain/config
@@ -122,31 +122,6 @@ elsif ($kimage =~ m/^[iI]mage$/o) { my $nop = $kimage;   }
 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;
diff --git a/linux-2.6/debian/templates/temp.image.plain/postinst b/linux-2.6/debian/templates/temp.image.plain/postinst
index 6508d60..8cd0c6f 100755
--- a/linux-2.6/debian/templates/temp.image.plain/postinst
+++ b/linux-2.6/debian/templates/temp.image.plain/postinst
@@ -767,17 +767,6 @@ sub image_magic {
   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);
diff --git a/linux-2.6/debian/templates/temp.image.plain/templates b/linux-2.6/debian/templates/temp.image.plain/templates
index 502332a..8c75f45 100644
--- a/linux-2.6/debian/templates/temp.image.plain/templates
+++ b/linux-2.6/debian/templates/temp.image.plain/templates
@@ -71,13 +71,6 @@ Description: Create a symbolic link to the current kernel image?
  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