Changeset 3647 in MondoRescue

Timestamp:

Jan 13, 2017, 5:35:12 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Fix #805 by forcing the usage of parted when more than 1000 disks are reported by fdisk

File:

• branches/3.3/mindi/mr-parted2fdisk (modified) (2 diffs)

branches/3.3/mindi/mr-parted2fdisk

@@ -170 +170 @@
 }
 
-# Create a device var which will be the devide or partition on which to work
+# Create a device var which will be the device or partition on which to work
 # whatever the option used.
 $device = $ARGV[0] if (defined $opts{'l'});
@@ -243 +243 @@
 $min =~ s/[a-z]+// if (defined $min);
 
+# fdisk has a bug when handling more than 1024 disks, seen on RHEL
+# so in that case we want to use parted instead
+# # Cf: http://trac.mondorescue.org/ticket/805
+my $use_parted = 0;
+open(CMD,"LANGUAGE=C $fdisk -l |") || die "Unable to execute $fdisk";
+my $lines = 0;
+while (<CMD>) {
+    $lines++ if ($_ =~ /^Disk \//);
+}
+close(CMD);
+# More than 1000 is a lot of disks so may triggers the issue
+$use_parted = 1 if ($lines >= 1000);
+
 # Check partition table type
 $type = mr_disk_type($device);
 # Replacement code only for GPT disks
-if ((($v == 1) || (($v == 2) && ($maj < 22))) && ($type ne "MBR")) {
+if (((($v == 1) || (($v == 2) && ($maj < 22))) && ($type ne "MBR")) || ($use_parted == 1)) {
     pb_log(1,"This distribution uses an old fdisk, activating replacement code for GPT disk label...\n");
     my $parted = pb_check_req("parted",0);