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

[Maximilian Attems]

Author: maks
Date: Mon Jul 27 12:12:53 2009
New Revision: 14016

Log:
axe old k-p legacy checks on files in /

linux-2.6 never installed stuff in /,
we shouldn't care at all about this.

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:12:33 2009	(r14015)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/config	Mon Jul 27 12:12:53 2009	(r14016)
@@ -222,63 +222,6 @@
   }
 }
 
-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__

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:12:33 2009	(r14015)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Mon Jul 27 12:12:53 2009	(r14016)
@@ -996,37 +996,6 @@
     }
   }
 
-  if ($initrd && -l "initrd" ) {
-    my $ret;
-    my $seen;
-    my $answer;
-    my $question = "${package_name}/postinst/old-initrd-link-$version";
-
-    ($ret,$answer) = get("$question");
-    die "Error retreiving answer for $question: $answer" if $ret;
-
-    $answer =~ s/^\s+//;
-    $answer =~ s/\s+$//;
-    if ($answer =~ /^(y|t)/i) {
-      unlink "initrd";
-    }
-  }
-
-  if ($initrd && -l "$image_dir/initrd" && ! $link_in_boot) {
-    my $ret;
-    my $seen;
-    my $answer;
-    my $question = "${package_name}/postinst/old-dir-initrd-link-$version";
-
-    ($ret,$answer) = get("$question");
-    die "Error retreiving answer for $question: $answer" if $ret;
-
-    $answer =~ s/^\s+//;
-    $answer =~ s/\s+$//;
-    if ($answer =~ /^(y|t)/i) {
-      unlink "$image_dir/initrd";
-    }
-  }
 }
 else {                        # Not making an initrd emage
   if (-l "initrd.img") {
@@ -1060,24 +1029,6 @@
   }
 }
 
-# We used to have System.* files in /
-if (-e "/System.map" || -e "/System.old") {
-  my $ret;
-  my $answer;
-  my $question = "${package_name}/postinst/old-system-map-link-$version";
-
-  ($ret,$answer) = get("$question");
-  die "Error retreiving answer for $question: $answer" if $ret;
-
-  $answer =~ s/^\s+//;
-  $answer =~ s/\s+$//;
-  if ($answer =~ /^(y|t)/i) {
-    unlink '/System.map' if -e '/System.map';
-    unlink '/System.old' if -e '/System.old';
-    print STDERR "Obsolete links removed.\n";
-  }
-}
-
 # creating some info about kernel and initrd
 if ($DEBUG) {
   my $ksize=sprintf("%.0f",(stat($realimageloc .

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:12:33 2009	(r14015)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/templates	Mon Jul 27 12:12:53 2009	(r14016)
@@ -105,39 +105,6 @@
  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