[kernel] r15173 - in dists/trunk/linux-2.6/debian: . templates/temp.image.plain

[Maximilian Attems]

Author: maks
Date: Tue Feb 16 10:13:55 2010
New Revision: 15173

Log:
Postinst only write kernel-img.conf for palo boxes.

there wasnt much point in writing an empty file with comments anyway.
linux-2.6 images should now be piuparts clean on most archs.

this is a tamed down version of the orginal proposal to get
it rid everywhere:
http://lists.debian.org/debian-kernel/2009/11/msg00328.html

Reviewed-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Feb 16 05:10:14 2010	(r15172)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Feb 16 10:13:55 2010	(r15173)
@@ -9,6 +9,7 @@
 
   [ maximilian attems]
   * Postinst don't refercence k-p related manpage. (Closes: #542208)
+  * Postinst only write kernel-img.conf for palo boxes.
 
   [ Bastian Blank ]
   * Restrict access to sensitive SysRq keys by default.

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Tue Feb 16 05:10:14 2010	(r15172)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Tue Feb 16 10:13:55 2010	(r15173)
@@ -475,22 +475,21 @@
       die("Failed to copy " . $realimageloc . "$image_name to "
           . $image_dest . "$kimage .\n");
     }
-  } 
-  else {
+  } else {
     if (! $have_conffile) {
       # current default
       $do_symlink = "Yes";
 
-      if (open(CONF, ">$CONF_LOC")) {
-        print CONF "# Kernel Image management overrides\n";
-        if ($loader =~ /palo/i) {
+      if ($loader =~ /palo/i) {
+         if (open(CONF, ">$CONF_LOC")) {
+          print CONF "# Kernel Image management overrides\n";
           print CONF "link_in_boot = Yes\n";
           print CONF "do_symlinks = Yes\n";
           print CONF "do_bootloader = No\n";
+          close CONF;
+          $have_conffile = "Yes";
         }
-        close CONF;
       }
-      $have_conffile = "Yes";
     }
   }