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

[Ben Hutchings]

Author: benh
Date: Thu Dec 10 01:48:04 2009
New Revision: 14768

Log:
postinst: Fix failure paths in check for missing firmware (Closes: #560263)

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	Wed Dec  9 13:15:29 2009	(r14767)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Dec 10 01:48:04 2009	(r14768)
@@ -10,7 +10,9 @@
   
   [ Ben Hutchings ]
   * aufs2: Update to snapshot from 2009-12-05
-	
+  * postinst: Fix failure paths in check for missing firmware
+    (Closes: #560263)
+
  -- Bastian Blank <waldi at debian.org>  Sun, 06 Dec 2009 20:42:14 +0100
 
 linux-2.6 (2.6.32-1) unstable; urgency=low

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Wed Dec  9 13:15:29 2009	(r14767)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Thu Dec 10 01:48:04 2009	(r14768)
@@ -625,8 +625,7 @@
 ######################################################################
 ######################################################################
 
-# We may not have any modules installed
-if ( -d "$modules_base/$version" ) {
+sub do_modules {
   print STDERR "Running depmod.\n";
   my $ret = system("depmod -a -F $realimageloc/System.map-$version $version");
   my $exit_value  = $? >> 8;
@@ -698,11 +697,10 @@
     my $new_patchlevel = $version;
     $new_patchlevel =~ s/^2\.6\.(\d+).*/$1/;
 
-  FIRMWARE_CHECK:
     if ($new_patchlevel > $running_patchlevel) {
       my $missing = '';
       my %module_paths;
-      open(DEP, "<$modules_base/$version/modules.dep") or last FIRMWARE_CHECK;
+      open(DEP, "<$modules_base/$version/modules.dep") or return;
       while (<DEP>) {
 	if (m|(.*/([^/]*)\.ko):|) {
 	  my ($path, $module) = ($1, $2);
@@ -711,7 +709,7 @@
 	}
       }
       close(DEP);
-      open(MODULES, '</proc/modules') or last FIRMWARE_CHECK;
+      open(MODULES, '</proc/modules') or return;
       while (<MODULES>) {
 	s/ .*//s;
 	my $module = $_;
@@ -769,6 +767,10 @@
   }
 }
 
+# We may not have any modules installed
+if (-d "$modules_base/$version") {
+  &do_modules();
+}
 
 
 sub find_initramfs_tool {