Changeset 3249 in MondoRescue for branches

Timestamp:

Feb 27, 2014, 3:48:19 AM (11 years ago)

Author:

Bruno Cornec

Message:

• create function mr_kernel_get_modules in MondoRescue::Kernel.pm from code previously in get-modules.pl which now just calls it

Location:

branches/3.2

Files:

• MondoRescue/lib/MondoRescue/Kernel.pm (modified) (3 diffs)
• mindi/get-modules.pl (modified) (1 diff)

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

@@ -12 +12 @@
 use strict 'vars';
 use Data::Dumper;
+use POSIX "uname";
 use lib qw (lib);
 use ProjectBuilder::Base;
@@ -26 +27 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(mr_kernel_get_version);
+our @EXPORT = qw(mr_kernel_get_version mr_kernel_get_modules);
 
 =pod
@@ -55 +56 @@
 $kernelver = "unknown";
 
-($os,$ver,$kernelver,$rest) = split(/ /,$mr_os->{'files'}->{'proc_version'}) if ($mr_os->{'os'} eq "linux");
+my ($sysname, $nodename, $release, $version, $machine ) = uname();
+$kernelver = $release if (defined $release);
 
 return($kernelver);
+}
+
+
+=item B<mr_kernel_get_modules>
+
+Tis function takes as input the kernel version to examined (can be undef in which case the running kernel is used) and a list of modules names to examined as well (can be undef in which case all modules ar taken)
+This function returns back the modules path as a first argument and the list of relative modules path for the modules names passed.
+
+Example:
+mr_kernel_get_modules("3.8.13.4-desktop-1.mga3","ext3") returns
+("/lib/modules/3.8.13.4-desktop-1.mga3", "kernel/fs/ext3/ext3.ko.xz","kernel/fs/jbd/jbd.ko.xz")
+
+=cut
+
+sub mr_kernel_get_modules {
+
+my $ver = $_;
+$ver = mr_kernel_get_version() if (not defined ($ver));
+my @allmodules = @_;
+
+my $module = ""; 
+my %modlist;
+my $void = "";
+my @allmodpaths;
+my $modulepath = "";
+
+# If no module names list passed as parameter, the work on all modules of the system
+if (not defined $allmodules[0]) {
+    open(LSMOD, "/sbin/lsmod |") or die "Unable to launch lsmod";
+    while (<LSMOD>) {
+        next if (/^Module/);
+        ($module, $void) = split(/ /);
+        push @allmodules,$module;
+    }
+    close(LSMOD);
+}
+
+open(DEPMOD, "/sbin/depmod -n $ver |") or die "Unable to launch depmod";
+while (<DEPMOD>) {
+    ($module, $void) = split(/:/);
+    last if ($module =~ /^#/);
+    chomp($void);
+    $modlist{$module} = $void;
+    pb_log(2,"Depmod on $module gives $void\n");
+}
+close(DEPMOD);
+
+#print Dumper(%modlist)."\n";
+
+my $lib;
+my $modulep;
+my $kernelv;
+my $modpath;
+
+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";
+    $module = <MODINFO>;
+    close(MODINFO);
+    if ((not defined $module) || ($module =~ '^$')) {
+        pb_log(1,"WARNING: No modinfo for module $m\n");
+        next;
+    }
+    chomp($module);
+    ($void,$lib,$modulep,$kernelv,$modpath) = split(/\//,$module,5);
+    next if (not defined $modpath);
+    pb_log(2,"modpath: $modpath\n");
+    push @allmodpaths,$modpath,split(/ /,$modlist{$modpath});
+}
+$modulepath = "/$lib/$modulep/$kernelv";
+pb_log(1,"modules path: $modulepath\n");
+pb_log(1,"all modpaths: ".join(' ',@allmodpaths)."\n");
+return($modulepath,@allmodpaths);
 }
 

branches/3.2/mindi/get-modules.pl

@@ -4 +4 @@
 use POSIX "uname";
 use Data::Dumper;
+use ProjectBuilder::Base;
+use MondoRescue::Kernel;
 
-my ($sysname, $nodename, $release, $version, $machine ) = uname();
-my $ver = "";
-my $module = ""; 
-my %modlist;
-my $void = "";
-my $allmodules = "";
+my $ver = undef;
 
-
-if (not (defined $ARGV[0])) {
-        $ver = $release;
-} else {
-        $ver = $ARGV[0];
+if ((defined $ARGV[0]) && ($ARGV[0] eq "-v")) {
+    #$pbverbose = 1;
+    shift;
 }
-open(LSMOD, "/sbin/lsmod |") or die "Unable to launch lsmod";
-open(DEPMOD, "/sbin/depmod -n $ver |") or die "Unable to launch depmod";
-
-while (<DEPMOD>) {
-    ($module, $modlist{$module}) = split(/:/);
-    chomp($modlist{$module});
-    last if ($module =~ /^#/);
-    #print "Analyzing $module\n";
+if ((defined $ARGV[0]) && ($ARGV[0] eq "-k")) {
+    shift;
+    $ver = $ARGV[0];
+    shift;
 }
-print Dumper(%modlist)."\n";
-while (<LSMOD>) {
-    next if (/^Module/);
-    ($module, $void) = split(/ /);
-    #print "Analyzing $module\n";
-    $module = `/sbin/modinfo -n $module`;
-    chomp($module);
-    my ($void,$lib,$modulep,$kernelv,$modpath) = split(/\//,$module,5);
-    print "modpath: $modpath\n";
-    $allmodules .= $modlist{$modpath};
-}
-close(LSMOD);
-close(DEPMOD);
-$allmodules =~ s/\n/ /g;
-$allmodules =~ s/  */ /g;
-$allmodules =~ s/ [0-9A-z\/]*\// /g;
-$allmodules =~ s/\.ko.xz//g;
-print "all modules: $allmodules\n";
+my ($modulepath,@allmodpaths) = mr_kernel_get_modules($ver,@ARGV);
+print "modules path: $modulepath\n";
+print "all modpaths: ".join(' ',@allmodpaths)."\n";