[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: piupart failure on preinst



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.


diff --git a/linux-2.6/debian/templates/temp.image.plain/config b/linux-2.6/debian/templates/temp.image.plain/config
index f9e1494..f04f58f 100755
--- a/linux-2.6/debian/templates/temp.image.plain/config
+++ b/linux-2.6/debian/templates/temp.image.plain/config
@@ -222,63 +222,6 @@ if (! -e "$kimage" && ! $no_symlink && ! $reverse_symlink &&
   }
 }
 
-if ($initrd && -l "$image_dest/initrd" ) {
-  my $ret;
-  my $seen;
-  my $question = "${package_name}/postinst/old-initrd-link-$version";
-
-  ($ret,$seen) = input('medium', "$question");
-  if ($ret && $ret != 30 ) {
-    die "Error setting debconf question $question: $seen";
-  }
-
-  ($ret,$seen) = go ();
-  if ($ret && $ret != 30 ) {
-    die "Error asking debconf question $question: $seen";
-  }
-}
-
-if ($initrd && -l "$image_dir/initrd" && ! $link_in_boot) {
-  my $ret;
-  my $seen;
-  my $question = "${package_name}/postinst/old-dir-initrd-link-$version";
-
-  $ret = subst("$question", 'image_dir', "$image_dir");
-  die "Error setting debconf substitutions in $question: $seen" if $ret;
-
-  $ret = subst("$question", 'image_dest', "$image_dest");
-  die "Error setting debconf substitutions in $question: $seen" if $ret;
-
-  ($ret,$seen) = input('medium', "$question");
-  if ($ret && $ret != 30 ) {
-    die "Error setting debconf question $question: $seen";
-  }
-
-  ($ret,$seen) = go ();
-  if ($ret && $ret != 30 ) {
-    die "Error asking debconf question $question: $seen";
-  }
-}
-
-
-# We used to have System.* files in /
-if (-e "/System.map" || -e "/System.old") {
-  my $ret;
-  my $seen;
-  my $question = "${package_name}/postinst/old-dir-initrd-link-$version";
-
-  ($ret,$seen) = input('medium', "$question");
-  if ($ret && $ret != 30 ) {
-    die "Error setting debconf question $question: $seen";
-  }
-
-  ($ret,$seen) = go ();
-  if ($ret && $ret != 30 ) {
-    die "Error asking debconf question $question: $seen";
-  }
-}
-
-
 exit 0;
 
 __END__
diff --git a/linux-2.6/debian/templates/temp.image.plain/templates b/linux-2.6/debian/templates/temp.image.plain/templates
index f9a747e..8b88ae0 100644
--- a/linux-2.6/debian/templates/temp.image.plain/templates
+++ b/linux-2.6/debian/templates/temp.image.plain/templates
@@ -105,39 +105,6 @@ Description: Abort installation after depmod error?
  modules.dep file. If you don't abort the installation, there is
  a danger that the system will fail to boot.
 
-Template: =ST-image-=V/postinst/old-initrd-link-=V
-Type: boolean
-Default: true
-Description: Should the old initrd link be deleted now?
- There is an old initrd symbolic link in place. The name of
- the symbolic link is being changed to initrd.img. If the old link is
- deleted, you may have to update the boot loader. If the link is left in
- place, it will point to the wrong image.
-
-Template: =ST-image-=V/postinst/old-dir-initrd-link-=V
-Type: boolean
-Default: true
-Description: Should the old initrd link be deleted now?
- There is an old ${image_dir}/initrd symbolic link in
- place. The location of the symbolic link is now the same location as
- the kernel image symbolic links, in ${image_dest}. If the old
- link is deleted, you may have to update the boot loader. If the link
- is left in place, it will point to the wrong image.
-
-Template: =ST-image-=V/postinst/old-system-map-link-=V
-Type: boolean
-Default: true
-Description: Should the old /System.map link be deleted now?
- There is a /System.map symbolic link. Such links were installed by ancient
- kernel image packages.
- .
- However, all the programs that look at the
- information in the map files (including top, ps, and klogd)
- will also look at /boot/System.map-=V.
- .
- Some programs may however give priority to /System.map and it
- is therefore recommended to delete that link.
-
 Template: shared/kernel-image/really-run-bootloader
 Type: boolean
 Default: true


Reply to: