Changeset 3447 in MondoRescue for branches/3.2/MondoRescue/lib/MondoRescue/Disk.pm

Timestamp:

Aug 30, 2015, 2:33:49 AM (9 years ago)

Author:

Bruno Cornec

Message:

• Adds a mr-device-mounted binary to MondoRescue (replaces the code of the C function is_this_device_mounted) and the corresponding perl function (mr_device_mounted) to handle cases where a mounted device has a different name than the one seen on mount (e.g. /dev/rhel/root and /dev/mapper/rhel-root)
• Adds perl function mr_file_copy_and_erase_hash to empty the hash generated in mr_file_read_all_link and thus avoid filling the hash it generates, which is useful for a recursive function, but not when called multiple times from another perl script. To be improved later on.
• Adapt build procedure to the new binary (tested on Mageia 5 and RHEL7)

File:

• branches/3.2/MondoRescue/lib/MondoRescue/Disk.pm (modified) (3 diffs)

branches/3.2/MondoRescue/lib/MondoRescue/Disk.pm

@@ -13 +13 @@
 use ProjectBuilder::Base;
 use English;
+use MondoRescue::File;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -22 +23 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(mr_disk_type);
+our @EXPORT = qw(mr_disk_type mr_device_mounted);
 
 =pod
@@ -66 +67 @@
 
 
+=item B<mr_device_mounted>
+
+This function returns the mount point if a device is mounted and undef if not.
+
+=cut
+
+sub mr_device_mounted {
+
+my $device = shift;
+
+return(1) if ((not defined $device) || ($device =~ "^/sys|^/proc"));
+
+my $h = mr_file_read_all_link($device);
+# Preserve that hash locally before earsing it to reuse another one
+my $h2 = mr_file_copy_and_erase_hash($h);
+
+foreach my $f (keys %$h2) {
+    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") {
+        # 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);
+            $h = mr_file_read_all_link($mntp);
+            foreach my $m (keys %$h) {
+                pb_log(2,"== Working on mounted device $m\n");
+                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);
+                }
+            }
+            my $h3 = mr_file_copy_and_erase_hash($h);
+        }
+        close(MOUNT);
+    }
+}
+
+# Not found
+return(undef);
+}