[systemimager-commits] r4396 - trunk/lib/SystemImager

[<ar...@sy...>]

Author: arighi
Date: 2008-02-23 16:16:56 -0600 (Sat, 23 Feb 2008)
New Revision: 4396

Modified:
   trunk/lib/SystemImager/UseYourOwnKernel.pm
Log:
- fix: correctly skip non-kernel files in UYOK kernel detection

The absolute path of the file is passed to is_kernel() routine, so we must get
only the filename to apply the filename-based matching regexp.


Modified: trunk/lib/SystemImager/UseYourOwnKernel.pm
===================================================================
--- trunk/lib/SystemImager/UseYourOwnKernel.pm	2008-02-23 21:10:20 UTC (rev 4395)
+++ trunk/lib/SystemImager/UseYourOwnKernel.pm	2008-02-23 22:16:56 UTC (rev 4396)
@@ -22,6 +22,7 @@
 package SystemImager::UseYourOwnKernel;
 
 use strict;
+use File::Basename;
 use SystemImager::Config qw($config);
 
 our $verbose;
@@ -338,6 +339,7 @@
         # -BEF-
 
         my $file = shift;
+        my $filename = basename($file);
 
         #
         # Make sure it's binary
@@ -350,19 +352,19 @@
         if( -l $file )   { return undef; }
         #
         # skip .bak files
-        if( $file =~ /\.bak$/ )   { return undef; }
+        if( $filename =~ /\.bak$/ )   { return undef; }
         #
-        # eliminate vmlinux files on RH
-        if( $file =~ m/^vmlinux$/ ) { return undef; }
-        #
         # eliminate ramdisks
-        if( $file =~ m/initrd/ ) { return undef; }
+        if( $filename =~ m/initrd/ ) { return undef; }
         #
+        # eliminate vmlinux files
+        if( $filename =~ m/^vmlinux/ ) { return undef; }
+        #
         # eliminate memtest
-        if( $file =~ m/^memtest/ ) { return undef; }
+        if( $filename =~ m/^memtest/ ) { return undef; }
         #
         # eliminate message
-        if( $file =~ m/^message/ ) { return undef; }
+        if( $filename =~ m/^message/ ) { return undef; }
 
         #
         # Get output from "file" for elimination by identification tests
@@ -385,7 +387,7 @@
 # Usage:
 #       my $kernel_file = _choose_kernel_file( $uname_r, $image_dir );
 #
-sub _choose_kernel_file($) {
+sub _choose_kernel_file {
 
         my $uname_r = shift;
         my $image_dir = shift;