Changeset 3691 in MondoRescue for branches

Timestamp:

Oct 7, 2017, 12:50:35 AM (7 years ago)

Author:

Bruno Cornec

Message:

Fix the parted part usage (review creation of partitions with RHEL7)

File:

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

branches/3.3/mindi/mr-parted2fdisk

@@ -160 +160 @@
 ) || pb_syntax(-1,0);
 
+pb_temp_init();
+
 if (defined $opts{'L'}) {
     open(pbLOG,"> $opts{'L'}") || die "Unable to log to $opts{'L'}: $!";
@@ -243 +245 @@
 # 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
+# Cf: http://trac.mondorescue.org/ticket/805
 my $use_parted = 0;
 open(CMD,"LANGUAGE=C $fdisk -l |") || die "Unable to execute $fdisk";
@@ -252 +254 @@
 close(CMD);
 # More than 1000 is a lot of disks so may triggers the issue
-my $maxhdd = 1;
+my $maxhdd = 1000;
 $use_parted = 1 if ($lines >= $maxhdd);
 
@@ -282 +284 @@
                 print "command (m for help) sent back to fake fdisk for mondorestore\n";
             } elsif ($i =~ /^n$/) {
+                $endmax = get_max($device);
+                $un = get_un($device,undef,0);
+                my $sizemax = $endmax*$mega;
                 fdisk_list($device,undef,\%start,\%end, 0);
-                if ($type ne "GPT") {
-                    pb_log(1,"Forcing GPT type of disk label\n");
+                if (($type ne "GPT") && ($sizemax > 2*$mega*$mega)){
+                    pb_log(0,"INFO: Forcing GPT type of disk label due to size > 2TB\n");
                     pb_log(1,"mklabel gpt\n");
                     pb_system("$parted -s $device mklabel gpt\n") if ($fake == 0);
@@ -315 +320 @@
                 }
                 $cylstart = 1 if ($cylstart < 1);
-                $un = get_un($device, "", 0);
                 # parted needs MB
                 if ($cylstart == 1) {
-                    $start = 0.01;
+                    $start = $cylstart;
                 } else {
-                    $start = $cylstart* $un / $mega + 0.001;
-                }
+                    $start = $cylstart* $un / $mega;
+                }
+                pb_log(1,"start: $start\n");
                 # this is a size in B/KB/MB/GB
 
-                $endmax = get_max($device);
                 $cylend = <STDIN>;
                 chomp($cylend);
@@ -340 +344 @@
                     $cylend /= $un;
                     $cylend = sprintf("%d",$cylend);
-                    $cylend += $cylstart - 0.001;
+                    $cylend += $cylstart;
                     # We now have the end cyl
                 }
@@ -347 +351 @@
                 # parted needs MB
                 $end = $cylend * $un / $mega;
+                pb_log(1,"end: $end\n");
                 pb_log(1,"n $l $part $cylstart $cylend => mkpart primary ext2 $start $end\n");
+                # Would that work ??? pb_system("$parted -s $device unit cyl\n") if ($fake == 0);
                 pb_system("$parted -s $device mkpart primary ext2 $start $end\n") if ($fake == 0);
                 print "command (m for help) sent back to fake fdisk for mondorestore\n";
@@ -553 +559 @@
 
 $endmax = get_max($device);
+# Returned KB change to MB
+$endmax = sprintf("%d",$endmax*$mega);
 
 # This will return MB
@@ -619 +627 @@
 my $device = shift;
 my $max = 0;
-my $foo;
-
-open (FDISK, "$fdisk -l $device 2>/dev/null |") || die "Unable to read from $fdisk";
+
+open (FDISK, "$fdisk -s $device 2>/dev/null |") || die "Unable to read from $fdisk";
 while (<FDISK>) {
-    if ($_ =~ /heads/) {
-        chomp;
-        $max = $_;
-        $max =~ s/.* ([0-9]+) cylinders/$1/;
-    }
-}
-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/;
-        }
-    }
+    chomp;
+    $max = $_;
 }
 close(FDISK);
-pb_log(2,"get_max returns $max\n");
+pb_log(2,"get_max returns $max kB\n");
 return($max);
 }
@@ -657 +649 @@
 my $foo;
 
-open (FDISK, "$fdisk -l $device 2>/dev/null |") || die "Unable to read from $fdisk";
+# Use -u=cylinders for recent fdisk, if it fails, it's an older fdisk which uses cylinders by default
+open (FDISK, "$fdisk -u=cylinders -l $device 2>/dev/null |") || open (FDISK, "$fdisk -l $device 2>/dev/null |") || die "Unable to read from $fdisk";
 while (<FDISK>) {
     print if (($_ !~ /^\/dev\//) and (not (defined $wpart)) and ($verbose == 1));
     if ($_ =~ /^Units/) {
-        ($foo, $un , $foo) = split /=/;
+        ($foo, $un , $foo) = split(/=/);
         $un =~ s/[A-z\s=]//g;
         $un = eval($un);
@@ -667 +660 @@
 }
 close(FDISK);
-pb_log(2,"get_un returns $un\n");
+pb_log(2,"get_un returns $un bytes\n");
 return($un);
 }
@@ -733 +726 @@
 #3:735MB:500GB:499GB:::lvm;
 #
+# In a VM
+#BYT;
+#/dev/sda:7516MB:scsi:512:512:msdos:ATA QEMU HARDDISK:; 
+#1:1049kB:525MB:524MB:xfs::boot;
+#2:525MB:7516MB:6991MB:::lvm;
+#
 # On RHEL6:
 #BYT;
@@ -780 +779 @@
     }
 } else {
-    # Maintaned for compatibility with very old distributions now
+    # Maintained for compatibility with very old distributions now
     open(PARTED, "$parted -s $device print |") || die "Unable to read from $parted";
     # Skip 3 first lines