From 0444600a0f03ad98d31eee83ae160ddf415c0a3c Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Tue, 16 Feb 2010 10:13:55 +0000 Subject: [PATCH] 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 svn path=/dists/trunk/linux-2.6/; revision=15173 --- debian/changelog | 1 + debian/templates/temp.image.plain/postinst | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0e68f9029..2c1b00a67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ linux-2.6 (2.6.32-9) UNRELEASED; urgency=low [ 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. diff --git a/debian/templates/temp.image.plain/postinst b/debian/templates/temp.image.plain/postinst index 18ac378d7..586ef14ce 100755 --- a/debian/templates/temp.image.plain/postinst +++ b/debian/templates/temp.image.plain/postinst @@ -475,22 +475,21 @@ sub handle_missing_link { 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"; } }