Changeset 3553 in MondoRescue

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

Location:

branches/3.2

Files:

• MondoRescue/Makefile.PL (modified) (1 diff)
• MondoRescue/bin/mr-disk-list (added)
• MondoRescue/bin/mr-disk-type (added)
• MondoRescue/lib/MondoRescue/Disk.pm (modified) (3 diffs)
• mindi/mr-parted2fdisk (modified) (2 diffs)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)

branches/3.2/MondoRescue/Makefile.PL

@@ -18 +18 @@
     EXE_FILES    => [ qw( bin/mr-analyze-lvm 
                 bin/mr-check-lvm 
+                bin/mr-disk-list
+                bin/mr-disk-type
                 bin/mr-device-mounted
                 bin/mr-process-ldd

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;
     }

branches/3.2/mindi/mr-parted2fdisk

@@ -241 +241 @@
 $type = mr_disk_type($device);
 # Replacement code only for GPT disks
-if ((($v == 1) || (($v == 2) && ($maj < 22))) && ($type ne "msdos")) {
+if ((($v == 1) || (($v == 2) && ($maj < 22))) && ($type ne "MBR")) {
     pb_log(1,"This distribution uses an old fdisk, activating replacement code for GPT disk label...\n");
     my $parted = pb_check_req("parted",0);
@@ -258 +258 @@
             } elsif ($i =~ /^n$/) {
                 fdisk_list($device,undef,\%start,\%end, 0);
-                if ($type ne "gpt") {
+                if ($type ne "GPT") {
                     pb_log(1,"Forcing GPT type of disk label\n");
                     pb_log(1,"mklabel gpt\n");
                     pb_system("$parted -s $device mklabel gpt\n") if ($fake == 0);
-                    $type = "gpt";
+                    $type = "GPT";
                 }
                 $l = <STDIN>;

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -3316 +3316 @@
 {
     char *output = NULL;
-    char *tmp = NULL;
     char *command = NULL;
-    mr_asprintf(command, "mr-parted2fdisk -l %s 2>/dev/null | grep 'EFI GPT'", drive);
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(command, "mr-disk-type %s", drive);
+    mr_asprintf(output, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
-
-    if (strstr(tmp, "GPT") == NULL) {
-        mr_asprintf(output, "%s", "MBR");
-    } else {
-        mr_asprintf(output, "%s", "GPT");
-    }
-    mr_free(tmp);
 
     log_msg(0, "Found %s partition table format type on %s", output, drive);