Changeset 3250 in MondoRescue for branches

Timestamp:

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

Author:

Bruno Cornec

Message:

• The mr-kernel-get-modules program now returns all the full paths for all modules passed in parameters with their dependencies. Which is

exactly what needs mindi

Location:

branches/3.2/MondoRescue

Files:

• bin/mr-kernel-get-modules (moved) (moved from branches/3.2/mindi/get-modules.pl ) (1 diff)
• lib/MondoRescue/Kernel.pm (modified) (5 diffs)

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

@@ -18 +18 @@
     shift;
 }
-my ($modulepath,@allmodpaths) = mr_kernel_get_modules($ver,@ARGV);
-print "modules path: $modulepath\n";
-print "all modpaths: ".join(' ',@allmodpaths)."\n";
+if ((defined $ARGV[0]) && ($ARGV[0] eq "-m")) {
+    shift;
+}
+
+print join(' ',mr_kernel_get_modules($ver,@ARGV))."\n";

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

@@ -76 +76 @@
 sub mr_kernel_get_modules {
 
-my $ver = $_;
+my @allmodules = @_;
+my $ver = shift @allmodules;
 $ver = mr_kernel_get_version() if (not defined ($ver));
-my @allmodules = @_;
 
 my $module = ""; 
@@ -86 +86 @@
 my $modulepath = "";
 
+#print Dumper(@allmodules);
+
 # If no module names list passed as parameter, the work on all modules of the system
 if (not defined $allmodules[0]) {
@@ -92 +94 @@
         next if (/^Module/);
         ($module, $void) = split(/ /);
+        print "***$module***|***$void***\n";
         push @allmodules,$module;
     }
     close(LSMOD);
 }
+#print Dumper(@allmodules);
 
 open(DEPMOD, "/sbin/depmod -n $ver |") or die "Unable to launch depmod";
@@ -102 +106 @@
     last if ($module =~ /^#/);
     chomp($void);
+    $void =~ s/\s+//;
     $modlist{$module} = $void;
     pb_log(2,"Depmod on $module gives $void\n");
@@ -126 +131 @@
     ($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(2,"modpath: $modulepath/$modpath\n");
+    push @allmodpaths,"$modulepath/$modpath",map { "$modulepath/".$_ } 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);
+# From List::More
+my %seen = ();
+return(grep { not $seen{$_}++ } @allmodpaths);
 }