[kernel] r15460 - dists/sid/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Wed Mar 31 00:48:58 2010
New Revision: 15460

Log:
linux-base: Fix the condition for reconfiguration

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/linux-base.postinst

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Mar 30 21:56:54 2010	(r15459)
+++ dists/sid/linux-2.6/debian/changelog	Wed Mar 31 00:48:58 2010	(r15460)
@@ -15,6 +15,7 @@
     thanks to Michael Gilbert (Closes: #569724)
   * rt2860sta: Fix argument to linux_pci_unmap_single() (Closes: #575726)
   * nouveau: nv50: Implement ctxprog/state generation
+  * linux-base: Fix the condition for reconfiguration
 
   [ maximilian attems]
   * [alpha, hppa] Disable oprofile as tracing code is unsupported here.

Modified: dists/sid/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/sid/linux-2.6/debian/linux-base.postinst	Tue Mar 30 21:56:54 2010	(r15459)
+++ dists/sid/linux-2.6/debian/linux-base.postinst	Wed Mar 31 00:48:58 2010	(r15460)
@@ -1390,7 +1390,7 @@
 if ($deb_arch ne 's390') {
     my $libata_transition_ver =
 	($deb_arch eq 'i386' || $deb_arch eq 'amd64') ? '2.6.32-10' : '2.6.32-11';
-    if ($ARGV[0] eq 'reconfigure' ||
+    if ($ARGV[0] eq 'reconfigure' || defined($ENV{DEBCONF_RECONFIGURE}) ||
 	compare_versions($ARGV[1], $libata_transition_ver) < 0) {
 	DebianKernel::DiskId::transition();
     }