Changeset 3666 in MondoRescue

Timestamp:

Jun 7, 2017, 2:28:35 AM (7 years ago)

Author:

Bruno Cornec

Message:

Multiple mr-parted2fidsk fixes for parted usage

• support the boot flag and now prints '*' accordingly in hte output
• pnum for 83 is now fixed to ext3
• Fix detection of lvm partitions using flag
• Fix error messages when Bytes were returned as a measure

File:

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

branches/3.3/mindi/mr-parted2fdisk

@@ -121 +121 @@
 my %end;
 my %type;
+my %boot;
 my $fake = 0;
 my $mega = 1048576;
@@ -236 +237 @@
 # Reverse table of pid
 while (($i,$l) = each %pid) {
-    next if ($i eq "ext2");
     $pnum{$l} = $i;
 }
+$pnum{"83"} = "ext3";
 
 # fdisk has a bug when handling more than 1024 disks, seen on RHEL
@@ -346 +347 @@
                 # parted needs MB
                 $end = $cylend * $un / $mega;
-                pb_log(1,"n $l $part $cylstart $cylend => mkpart primary $start $end\n");
+                pb_log(1,"n $l $part $cylstart $cylend => mkpart primary ext2 $start $end\n");
                 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";
@@ -358 +359 @@
                 pb_log(1,"d $part => rm $part\n");
                 pb_system("$parted -s $device rm $part\n") if ($fake == 0);
-                get_parted($device,undef,\%start,\%end,undef);
+                get_parted($device,undef,\%start,\%end);
                 print "command (m for help) sent back to fake fdisk for mondorestore\n";
             } elsif ($i =~ /^w$/) {
@@ -517 +518 @@
 my $mstart;
 my $mend;
+my $mboot;
 my $length;
 my $pid;
 my $cmt;
+#   Device Boot      Start         End      Blocks   Id  System
+#/dev/hda1               1       77579    39099374+  ee  EFI GPT
 format FLOG1 =
-@<<<<<<<<<<<< @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-$part,        $mstart,   $mend,   $length,  $pid, $cmt
+@<<<<<<<<< @> @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+$part,     $mboot, $mstart,   $mend,   $length,  $pid, $cmt
 .
 format FLOG2 =
 @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 $part,
-              @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-              $mstart,   $mend,   $length,  $pid, $cmt
+           @> @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+           $mboot, $mstart,   $mend,   $length,  $pid, $cmt
 .
 format STDOUT1 =
-@<<<<<<<<<<<< @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-$part,        $mstart,   $mend,   $length,  $pid, $cmt
+@<<<<<<<<< @> @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+$part,     $mboot, $mstart,   $mend,   $length,  $pid, $cmt
 .
 format STDOUT2 =
 @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 $part,
-              @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-              $mstart,   $mend,   $length,  $pid, $cmt
+           @> @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+           $mboot, $mstart,   $mend,   $length,  $pid, $cmt
 .
-#   Device Boot      Start         End      Blocks   Id  System
-#/dev/hda1               1       77579    39099374+  ee  EFI GPT
 
 
@@ -553 +555 @@
 
 # This will return MB
-get_parted($device,$start,$end,\%type);
-
-while (($n,$d) = each %type) {
+get_parted($device,$start,$end,\%type,\%boot);
+
+foreach $n (sort keys %type) {
     # Print infos fdisk like
     $part = ${device}.$n;
@@ -570 +572 @@
     # length is in 1K blocks
     $length = sprintf("%d",($mend-$mstart+1)*$un/1024);
+    pb_log(2,"type $type{$n}\n");
     $pid = $pid{$type{$n}};
     $cmt = $cmt{$type{$n}};
-    pb_log(2,"$part - $mstart - $mend - $length\n");
+    $mboot = $boot{$n};
+    pb_log(2,"$part - $mboot - $mstart - $mend - $length\n");
 
     if ($verbose == 1) {
@@ -677 +681 @@
 my $end = shift;
 my $type = shift;
+my $boot = shift;
 my $void;
 my $d;
@@ -767 +772 @@
         $$end{$n} = $ret;
         $$type{$n} =~ s/\(..*\)$//;
-        pb_log(2,"$n      $$start{$n}      $$end{$n}     $$type{$n}\n");
+        $$type{$n} = "lvm" if (($$type{$n} eq "") && ($flag =~ /lvm/));
+        $$boot{$n} = "";
+        $$boot{$n} = "*" if ($flag =~ /boot/);
+        pb_log(2,"$n  $$boot{$n}    $$start{$n}      $$end{$n}     $$type{$n}\n");
     }
 } else {
@@ -816 +824 @@
 
 pb_log(2,"decode_Bsuf input: $size / $unit ");
-if ($size =~ /K[B]*$/i) {
-    $size =~ s/K[B]*$//i;
+# Suppress all B mention, including single B
+if ($size =~ /B$/i) {
+    $size =~ s/B$//i;
+}
+if ($size =~ /K$/i) {
+    $size =~ s/K$//i;
     $size *= $kilo;
-} elsif ($size =~ /M[B]*$/i) {
-    $size =~ s/M[B]*$//i;
+} elsif ($size =~ /M$/i) {
+    $size =~ s/M$//i;
     $size *= $kilo*$kilo;
-} elsif ($size =~ /G[B]*$/i) {
-    $size =~ s/G[B]*$//i;
+} elsif ($size =~ /G$/i) {
+    $size =~ s/G$//i;
     $size *= $kilo*$kilo*$kilo;
-} elsif ($size =~ /T[B]*$/i) {
-    $size =~ s/T[B]*$//i;
+} elsif ($size =~ /T$/i) {
+    $size =~ s/T$//i;
     $size *= $kilo*$kilo*$kilo*$kilo;
 } else {