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

Timestamp:

Apr 7, 2016, 3:47:44 AM (8 years ago)

Author:

Bruno Cornec

Message:

Help Fix #790

• Fix perl functions to handle disk type (MBR vs GPT) on RHEL7 and unify output format
• Adds perl function to list all disks on the system
• Adds perl program to unit test these functions
• which_partition_format now uses mr-disk-type

File:

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

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

@@ -23 +23 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(mr_disk_type mr_device_mounted);
+our @EXPORT = qw(mr_disk_list mr_disk_type mr_device_mounted);
 
 =pod
@@ -39 +39 @@
 =over 4
 
+=item B<mr_disk_list>
+
+This function uses fdisk to determine the list of all the disks on the system
+It returns an array of strings giving all the devices
+
+=cut
+
+sub mr_disk_list {
+
+my $fdisk = pb_check_req("fdisk",0);
+my @disks;
+
+open(FDISK, "LANG=C $fdisk -l 2>/dev/null |") || die "Unable to read from $fdisk";
+while (<FDISK>) {
+    chomp($_);
+    my $i = $_;
+    if ($i =~ /^Disk \//) {
+        pb_log(2,"Found disk line: $i\n");
+        $i =~ s|^Disk /([A-z0-9/_-]+):.*|/$1|;
+        pb_log(2,"Pushing $i\n");
+        push @disks,$i;
+    }
+}
+close(FDISK);
+pb_log(2,"Found the following disks: @disks\n");
+return (@disks);
+}
+
 =item B<mr_disk_type>
 
@@ -50 +78 @@
 my $device = shift;
 # MBR by default
-my $type = "msdos";
+my $type = "MBR";
 
 my $fdisk = pb_check_req("fdisk",0);
 
-open(FDISK, "$fdisk -l $device 2>/dev/null |") || die "Unable to read from $fdisk";
+open(FDISK, "LANG=C $fdisk -l $device 2>/dev/null |") || die "Unable to read from $fdisk";
 while (<FDISK>) {
-    if (($_ =~ /EFI GPT/) || ($_ =~ / GPT /)) {
-        $type= "gpt";
+    if (($_ =~ /EFI GPT/) || ($_ =~ / GPT /) || ($_ =~ /Disk[\s]*label type: gpt/)) {
+        $type= "GPT";
         last;
     }