Changeset 3664 in MondoRescue

Timestamp:

May 3, 2017, 11:27:15 AM (7 years ago)

Author:

Bruno Cornec

Message:

Attempts to fix mr-parted2fdisk

• usage of -m option of parted where possible to ease analysis
• handle new fdisk formats

File:

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

branches/3.3/mindi/mr-parted2fdisk

@@ -251 +251 @@
 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
+my $maxhdd = 1;
+$use_parted = 1 if ($lines >= $maxhdd);
+
+$device = "" if ((not defined $device) || ($device =~ /^-/));
+pb_log(1,"Called with device: $device\n");
+
+# Check partition table type. Works also if no device
 $type = mr_disk_type($device);
+
 # Replacement code only for GPT disks
 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");
+    if ($use_parted == 1) {
+        pb_log(1,"Using parted since we detected more than $maxhdd disks...\n");
+    } else {
+        pb_log(1,"This distribution uses an old fdisk, activating replacement code for GPT disk label...\n");
+    }
     my $parted = pb_check_req("parted",0);
     if (defined $opts{'l'}) {
-        fdisk_list($device,undef,\%start,\%end, 1);
+        fdisk_list_all($device,undef,\%start,\%end, 1);
     } elsif (defined $opts{'s'}) {
         fdisk_list($device,$wpart,\%start,\%end, 1);
@@ -467 +476 @@
 open(PART,"/proc/partitions") || die "Unable to open /proc/partitions";
 while (<PART>) {
-    my ($maj,$min,$blocks,$dev) = split(/\s+/);
-    next if ($dev =~ /^fd|^sr/);
-    next if ($min != 0);
+    # Skip first cmt line if present or empty lines
+    next if (($_ =~ /^maj/) || ($_ =~ /^\s*$/));
+    my ($void,$maj,$min,$blocks,$dev) = split(/\s+/);
+    next if ((not defined $dev) || ($dev =~ /^fd|^sr|^ram/));
+    next if ((not defined $min) || ($min != 0));
     fdisk_list("/dev/$dev",$wpart,$start,$end,$verbose);
 }
@@ -550 +561 @@
     # so return in MB * 1MB / what represents 1 cyl in B
     $mstart = sprintf("%d",$$start{$n}*$mega/$un);
+    pb_log(2,"mstart: $mstart\n");
     $mstart = 1 if ($mstart < 1);
     $mstart = $endmax if ($mstart > $endmax);
     $mend = sprintf("%d",$$end{$n}*$mega/$un - 1);
     $mend = $endmax if ($mend > $endmax);
+    pb_log(2,"mend $mend\n");
     $mend = 1 if ($mend < 1);
     # length is in 1K blocks
@@ -559 +572 @@
     $pid = $pid{$type{$n}};
     $cmt = $cmt{$type{$n}};
-    #print FLOG "$part - $mstart - $mend - $length\n";
+    pb_log(2,"$part - $mstart - $mend - $length\n");
 
     if ($verbose == 1) {
@@ -612 +625 @@
     }
 }
+if ($max == 0) {
+    close(FDISK);
+    # Try by forcing the cylinders display, not done by default on more recent fdisk
+    open (FDISK, "$fdisk -u=cylinders -l $device 2>/dev/null |") || die "Unable to read from $fdisk -u=cylinders";
+    while (<FDISK>) {
+        if ($_ =~ /heads/) {
+            chomp;
+            $max = $_;
+            $max =~ s/.* ([0-9]+) cylinders/$1/;
+        }
+    }
+}
 close(FDISK);
 pb_log(2,"get_max returns $max\n");
@@ -659 +684 @@
 my $size;
 my $unit;
+my $flag;
 
 my $parted = pb_check_req("parted",0);
@@ -670 +696 @@
 my ($v,$maj,$min) = split(/\./,$d);
 # depending on parted version, information given change:
-if ($v == 2) {
+# parted >= 1.8.0 has support for -m option
+# Cf: http://git.savannah.gnu.org/cgit/parted.git/commit/?id=30e12276029b0b6c04d2d0edf2b9b00ba797013c
+if ($v >= 2) {
+    # RHEL 5 parted 1.8
     # RHEL 6 parted 2.1
+    # SLES 11 1.8.8
     $mode=2;
 } elsif ($v == 1) {
@@ -678 +708 @@
         # RHEL 4 parted 1.6.19
         $mode=0;
+    } elsif ($maj >= 8) {
+        $mode=2;
     } else {
         # SLES 10 parted >= 1.6.25
@@ -687 +719 @@
 pb_log(2,"parted mode: $mode\n");
 
-open(PARTED, "$parted -s $device print |") || die "Unable to read from $parted";
-# Skip 3 first lines
-$d = <PARTED>;
-$d = <PARTED>;
-$d = <PARTED>;
+# Result of parted -m -s /dev/sda print
+#
+# On RHEL7:
+#BYT;
+#/dev/sda:500GB:scsi:512:512:gpt:HP LOGICAL VOLUME:;
+#1:1049kB:211MB:210MB:fat16:EFI System Partition:boot;
+#2:211MB:735MB:524MB:ext4::;
+#3:735MB:500GB:499GB:::lvm;
+#
+# On RHEL6:
+#BYT;
+#/dev/sda:500GB:scsi:512:512:gpt:HP LOGICAL VOLUME;
+#1:1049kB:211MB:210MB:fat16::boot;
+#2:211MB:735MB:524MB:ext4::;
+#3:735MB:500GB:499GB:::lvm;
+#
+# On Debian 8
+#
+#BYT;
+#/dev/sda:500GB:scsi:512:512:gpt:HP LOGICAL VOLUME:;
+#1:1049kB:538MB:537MB:fat32::boot, esp;
+#2:538MB:7538MB:7000MB:ext4::;
+#3:7538MB:10.5GB:3000MB:ext4::;
+#4:10.5GB:44.6GB:34.1GB:linux-swap(v1)::;
+#5:44.6GB:45.0GB:400MB:ext4::;
+#6:45.0GB:500GB:455GB:ext4::;
 
 if ($mode == 2) {
+    # Then use option -m which is available
+    open(PARTED, "$parted -m -s $device print |") || die "Unable to read from $parted";
+    # Skip 2 first lines
+    $d = <PARTED>;
+    if ($d !~ /^BYT/) {
+        die "Your $parted command doesn't behave correctly in machine readable mode";
+    }
+    # Skip device line for now
+    $d = <PARTED>;
+    pb_log(2,"Got from parted: \n");
+    pb_log(2,"Minor    Start       End     Filesystem\n");
+    while (<PARTED>) {
+        ($n,$d) = split(/:/,$_,2);
+        ($$start{$n},$$end{$n},$size,$$type{$n},$void,$flag) = split(/:/,$d);
+        # Handles suffixes. Returns MB
+        $ret = decode_Bsuf($$start{$n},$mega);
+        $$start{$n} = $ret;
+        $ret = decode_Bsuf($$end{$n},$mega);
+        $$end{$n} = $ret;
+        $$type{$n} =~ s/\(..*\)$//;
+        pb_log(2,"$n      $$start{$n}      $$end{$n}     $$type{$n}\n");
+    }
+} else {
+    # Maintaned for compatibility with very old distributions now
+    open(PARTED, "$parted -s $device print |") || die "Unable to read from $parted";
+    # Skip 3 first lines
     $d = <PARTED>;
     $d = <PARTED>;
     $d = <PARTED>;
-}
-pb_log(2,"Got from parted: \n");
-pb_log(2,"Minor    Start       End     Filesystem\n");
-# Get info from each partition line
-while (($n,$d) = split(/\s/, <PARTED>,2)) {
-    chomp($d);
-    # v2 of parted ends with empty line
-    next if (($mode == 2) && ($n eq "") && ($d eq ""));
-    # v2 of parted starts with space potentially
-    ($n,$d) = split(/\s/, $d,2) if (($mode == 2) && ($n eq ""));
-    next if ($n !~ /^[1-9]/);
-    $d =~ s/^\s*//;
-    $d =~ s/\s+/ /g;
-    if ($mode == 0) {
-        ($$start{$n},$$end{$n},$$type{$n},$void) = split(/ /,$d);
-        $unit = 1;
-    } elsif ($mode == 1) {
-        ($$start{$n},$$end{$n},$size,$$type{$n},$void) = split(/ /,$d);
-        $unit = $mega;
-    } elsif ($mode == 2) {
-        ($$start{$n},$$end{$n},$size,$$type{$n},$void) = split(/ /,$d);
-        $unit = $mega;
-    } else {
-        die "Undefined mode $mode";
-    }
-    $$start{$n} = "" if (not defined $$start{$n});
-    $$end{$n} = "" if (not defined $$end{$n});
-    $$type{$n} = "" if (not defined $$type{$n});
-    # Handles potential suffixes in latest parted version. Return MB
-    $ret = decode_Bsuf($$start{$n},$unit);
-    $$start{$n} = $ret;
-    $ret = decode_Bsuf($$end{$n},$unit);
-    $$end{$n} = $ret;
-    pb_log(2,"$n      $$start{$n}      $$end{$n}     $$type{$n}\n");
+
+    pb_log(2,"Got from parted: \n");
+    pb_log(2,"Minor    Start       End     Filesystem\n");
+    # Get info from each partition line
+    while (($n,$d) = split(/\s/, <PARTED>,2)) {
+        chomp($d);
+        next if ($n !~ /^[1-9]/);
+        $d =~ s/^\s*//;
+        $d =~ s/\s+/ /g;
+        if ($mode == 0) {
+            ($$start{$n},$$end{$n},$$type{$n},$void) = split(/ /,$d);
+            $unit = 1;
+        } elsif ($mode == 1) {
+            ($$start{$n},$$end{$n},$size,$$type{$n},$void) = split(/ /,$d);
+            $unit = $mega;
+        } else {
+            die "Undefined mode $mode";
+        }
+        $$start{$n} = "" if (not defined $$start{$n});
+        $$end{$n} = "" if (not defined $$end{$n});
+        $$type{$n} = "" if (not defined $$type{$n});
+        # Handles potential suffixes in latest parted version. Return MB
+        $ret = decode_Bsuf($$start{$n},$unit);
+        $$start{$n} = $ret;
+        $ret = decode_Bsuf($$end{$n},$unit);
+        $$end{$n} = $ret;
+        pb_log(2,"$n      $$start{$n}      $$end{$n}     $$type{$n}\n");
+    }
 }
 close(PARTED);
@@ -740 +813 @@
 my $unit  = shift;
 my $ret = 0;
+my $kilo = 1024;
 
 pb_log(2,"decode_Bsuf input: $size / $unit ");
 if ($size =~ /K[B]*$/i) {
     $size =~ s/K[B]*$//i;
-    $size *= 1024;
+    $size *= $kilo;
 } elsif ($size =~ /M[B]*$/i) {
     $size =~ s/M[B]*$//i;
-    $size *= 1048576;
+    $size *= $kilo*$kilo;
 } elsif ($size =~ /G[B]*$/i) {
     $size =~ s/G[B]*$//i;
-    $size *= 1073741824;
+    $size *= $kilo*$kilo*$kilo;
 } elsif ($size =~ /T[B]*$/i) {
     $size =~ s/T[B]*$//i;
-    $size *= 1099511627776;
+    $size *= $kilo*$kilo*$kilo*$kilo;
 } else {
     # Nothing to do