Changeset 3742 in MondoRescue

Timestamp:

Nov 18, 2019, 12:02:21 PM (4 years ago)

Author:

Bruno Cornec

Message:

Fix non working mr-device-mounted

Location:

branches/3.3/MondoRescue

Files:

• bin/mr-device-mounted (modified) (1 diff)
• lib/MondoRescue/Disk.pm (modified) (3 diffs)
• lib/MondoRescue/File.pm (modified) (2 diffs)

branches/3.3/MondoRescue/bin/mr-device-mounted

@@ -62 +62 @@
 }
 
-my $txt = "";
-my $txt2 = "";
 my $ans = "";
 
 if (defined $ARGV[0]) {
     foreach my $i (@ARGV) {
+        my $txt = "";
+        my $txt2 = "";
         $ans = mr_device_mounted($i);
         $txt = " not" if (not defined $ans);

branches/3.3/MondoRescue/lib/MondoRescue/Disk.pm

@@ -105 +105 @@
 my $device = shift;
 
-return(1) if ((not defined $device) || ($device =~ "^/sys|^/proc"));
+return("") if ((not defined $device) || ($device =~ "^/sys|^/proc"));
 
+# Beware of how hashes are handled in these functions
 my $h = mr_file_read_all_link($device);
 # Preserve that hash locally before earsing it to reuse another one
@@ -114 +115 @@
     pb_log(2,"Working on device $f\n");
     # TODO: get them from a conf file - FreeBSD needs swapinfo for swap request
-    foreach my $dev ("mount","cat /proc/swaps") {
+    foreach my $dev ("mount","grep -Ev '^Filename' /proc/swaps") {
         # Look for the device in the command result
         open(MOUNT,"$dev|") || die "Unable to execute the $dev command";
         while (<MOUNT>) {
-            my ($mntp,$void) = split('\s',$_,2);
+            my ($mntp,$v1,$dir,$v3) = split('\s',$_,4);
             $h = mr_file_read_all_link($mntp);
             foreach my $m (keys %$h) {
@@ -124 +125 @@
                 if ($m eq $f) {
                     # Find the mountpoint and return it
-                    my ($void1,$mountpoint,$void2) = split('\s',$void);
-                    pb_log(2,"*** Found $m on $mountpoint\n") if (defined $mountpoint);
-                    return($mountpoint);
+                    pb_log(2,"*** Found $m on $dir\n") if (defined $dir);
+                    # Clean before returning
+                    mr_file_erase_hash($h);
+                    mr_file_erase_hash($h2);
+                    return($dir);
                 }
             }
-            my $h3 = mr_file_copy_and_erase_hash($h);
+            mr_file_erase_hash($h);
         }
         close(MOUNT);

branches/3.3/MondoRescue/lib/MondoRescue/File.pm

@@ -26 +26 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(mr_file_read_all_link mr_file_process_ldd mr_file_normalize mr_file_copy_and_erase_hash);
+our @EXPORT = qw(mr_file_read_all_link mr_file_process_ldd mr_file_normalize mr_file_erase_hash mr_file_copy_and_erase_hash);
 
 =pod
@@ -86 +86 @@
 
 =item B<mr_file_erase_hash>
+
+This function erases all elements in the hash passed in parameter (such as the one created in mr_file_read_all_link)
+
+=cut
+
+sub mr_file_erase_hash {
+
+my $files = shift;
+
+foreach my $i (keys %$files) {
+    delete $files->{$i};
+}
+return();
+}
+
+
+=over 4
+
+=item B<mr_file_copy_and_erase_hash>
 
 This function erases all elements in the hash passed in parameter (such as the one created in mr_file_read_all_link)