Changeset 3354 in MondoRescue

Timestamp:

Mar 5, 2015, 1:23:38 PM (9 years ago)

Author:

Bruno Cornec

Message:

• mr-kernel-get-modules now uses Getopt for parameter management, allowing verbosity increase
• Fix mr_kernel_get_modules to support depmod version providing relative paths such as on RHEL5
• Fix mr_kernel_get_modules to support modinfo version withou -k option support, using module full path instead
• the modlist hash is now having keys being full path module names as a consequence

Location:

branches/3.2/MondoRescue

Files:

• bin/mr-kernel-get-modules (modified) (1 diff)
• lib/MondoRescue/Kernel.pm (modified) (7 diffs)

branches/3.2/MondoRescue/bin/mr-kernel-get-modules

@@ -6 +6 @@
 use ProjectBuilder::Base;
 use MondoRescue::Kernel;
+use Getopt::Long qw(:config auto_abbrev no_ignore_case);
 
-my $ver = undef;
+my %opts;                           # CLI Options
 
-if ((defined $ARGV[0]) && ($ARGV[0] eq "-v")) {
-    #$pbverbose = 1;
-    shift;
-}
-if ((defined $ARGV[0]) && ($ARGV[0] eq "-k")) {
-    shift;
-    $ver = $ARGV[0];
-    shift;
-}
-if ((defined $ARGV[0]) && ($ARGV[0] eq "-m")) {
-    shift;
-}
+GetOptions(
+        "kernel|k:s" => \$opts{'k'},
+        "verbose|v+" => \$opts{'v'},
+);
 
-print join(' ',mr_kernel_get_modules($ver,@ARGV))."\n";
+$pbdebug = $opts{'v'};
+$pbdebug = 0 if (not defined $pbdebug);
+print join(' ',mr_kernel_get_modules($opts{'k'},@ARGV))."\n";

branches/3.2/MondoRescue/lib/MondoRescue/Kernel.pm

@@ -5 +5 @@
 # $Id$
 #
-# Copyright B. Cornec 2008-2014
+# Copyright B. Cornec 2008-2015
 # Provided under the GPL v2
 
@@ -12 +12 @@
 use strict 'vars';
 use Data::Dumper;
+use File::Basename;
 use POSIX "uname";
 use lib qw (lib);
@@ -82 +83 @@
 my $module = ""; 
 my %modlist;
+my %modpath;
 my $void = "";
 my @alllivemodules;
@@ -106 +108 @@
 
 # Now computes the dependencies of each module and store them in %modlist
+# # Some depmods gives a full path, others a relative path to /lib/modules/$ver
 open(DEPMOD, "/sbin/depmod -n $ver |") or die "Unable to launch depmod";
 while (<DEPMOD>) {
@@ -112 +115 @@
     chomp($void);
     $void =~ s/\s+//;
+    $module = "/lib/modules/$ver/$module" if ($module !~ /^\/lib\/modules/);
+    # Now module is a full path whatever depmod version
+    $void = join(' ',map { "/lib/modules/$ver/".$_ } split(/ /,$void)) if ($void !~ /^\/lib\/modules/);
+    # Now void is a full path of modules whatever depmod version
     $modlist{$module} = $void;
+    my $m = basename($module,".ko",".o",".ko.gz",".ko.bz",".ko.xz",".o.gz",".o.bz",".o.xz");
+    $modpath{$m} = $module;
     pb_log(2,"Depmod on $module gives $void\n");
 }
@@ -127 +136 @@
 foreach my $m (@allmodules) {
     pb_log(1,"Analyzing $m\n");
-    open(MODINFO, "/sbin/modinfo -n -k $ver $m 2>/dev/null |") or die "Unable to launch modinfo";
+    if (not defined $modpath{$m}) {
+        pb_log(1,"WARNING: No modpath for module $m\n");
+        next;
+    }
+    pb_log(2,"$m has a modpath of $modpath{$m}\n");
+    open(MODINFO, "/sbin/modinfo -n $modpath{$m} 2>/dev/null |") or die "Unable to launch modinfo";
     $module = <MODINFO>;
     close(MODINFO);
@@ -137 +151 @@
     ($void,$lib,$modulep,$kernelv,$modpath) = split(/\//,$module,5);
     next if (not defined $modpath);
-    if (not defined $modlist{$modpath}) {
-        pb_log(0,"No modlist found for $modpath\n");
+    if (not defined $modlist{$module}) {
+        pb_log(0,"No modlist found for $module\n");
         next;
     }
-    $modulepath = "/$lib/$modulep/$kernelv";
-    pb_log(2,"modpath: $modulepath/$modpath\n");
-    push @allmodpaths,"$modulepath/$modpath",map { "$modulepath/".$_ } split(/ /,$modlist{$modpath});
+    pb_log(2,"modpath: $module\n");
+    push @allmodpaths,$module,split(/ /,$modlist{$module});
 }
 pb_log(1,"all modpaths: ".join(' ',@allmodpaths)."\n");