Changeset 1565 in MondoRescue for branches/2.2.5/mindi/parted2fdisk.pl

Timestamp:

Jul 25, 2007, 3:38:42 PM (17 years ago)

Author:

Bruno Cornec

Message:

• arch => uname -m everywhere
• parted2fdisk adapted for parted differences on SLES 10 ia64
• reiserfs support added for parted2fdisk
• decode_Bsuf function added for parted2fdisk
• README.ia64 improved for SLES 10

File:

• branches/2.2.5/mindi/parted2fdisk.pl (modified) (14 diffs)

branches/2.2.5/mindi/parted2fdisk.pl

@@ -7 +7 @@
 #
 # Aims to be architecture independant (i386/ia64)
-# Tested on RHAS 2.1 ia64 - Mandrake 9.0 ia64 - RHAS 3.0 ia64
+# Tested on RHAS 2.1 ia64 - Mandrake 9.0 ia64 - RHAS 3.0 ia64 - SLES 10
 #
 # (c) Bruno Cornec <Bruno.Cornec@hp.com>
@@ -36 +36 @@
 my %end;
 my %type;
-my %flags;
 my $arch;
 my $fake = 0;
@@ -74 +73 @@
         "ext2" => "83",
         "ext3" => "83",
+        "reiserfs" => "83",
         "linux-swap" => "82",
         "LVM" => "8e",
@@ -194 +194 @@
                     if ($cylend =~ /^\+/) {
                         $cylend =~ s/^\+//;
-                        if ($cylend =~ /K$/) {
-                            $cylend =~ s/K$//;
-                            $cylend *= 1024;
-                        } elsif ($cylend =~ /M$/) {
-                            $cylend =~ s/M$//;
-                            $cylend *= 1048576;
-                        } elsif ($cylend =~ /G$/) {
-                            $cylend =~ s/G$//;
-                            $cylend *= 1073741824;
-                        }
+                        # Handles suffixes; return bytes
+                        $cylend = decode_Bsuf($cylend,1);
                         # This gives the number of cyl
                         $cylend /= $un;
@@ -342 +334 @@
         "ext2" => "Linux",
         "ext3" => "Linux",
+        "reiserfs" => "Linux",
         "linux-swap" => "Linux swap",
         "LVM" => "Linux LVM",
@@ -356 +349 @@
 my $cmt;
 format FLOG1 =
-@<<<<<<<<<<<< @>>>>>>>> @>>>>>>>> @>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+@<<<<<<<<<<<< @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 $part,        $mstart,   $mend,   $length,  $pid, $cmt
 .
@@ -362 +355 @@
 @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 $part,
-              @>>>>>>>> @>>>>>>>> @>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+              @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
               $mstart,   $mend,   $length,  $pid, $cmt
 .
 format STDOUT1 =
-@<<<<<<<<<<<< @>>>>>>>> @>>>>>>>> @>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+@<<<<<<<<<<<< @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 $part,        $mstart,   $mend,   $length,  $pid, $cmt
 .
@@ -372 +365 @@
 @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 $part,
-              @>>>>>>>> @>>>>>>>> @>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+              @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>>  @<<<<<<<<<<<<<<<<<<<<<<<<<<<<
               $mstart,   $mend,   $length,  $pid, $cmt
 .
-#/dev/hda1             1     77579  39099374+  ee  EFI GPT
+#   Device Boot      Start         End      Blocks   Id  System
+#/dev/hda1               1       77579    39099374+  ee  EFI GPT
+
 
 #
@@ -386 +381 @@
 
 # This will return MB
-get_parted ($device,$start,$end,\%type,\%flags);
+get_parted ($device,$start,$end,\%type);
 
 while (($n,$d) = each %type) {
@@ -395 +390 @@
     $mstart = sprintf("%d",$$start{$n}*1048576/$un);
     $mstart = 1 if ($mstart < 1);
+    $mstart = $endmax if ($mstart > $endmax);
     $mend = sprintf("%d",$$end{$n}*1048576/$un - 1);
     $mend = $endmax if ($mend > $endmax);
+    $mend = 1 if ($mend < 1);
     # length is in 1K blocks
     $length = sprintf("%d",($mend-$mstart+1)*$un/1024);
@@ -486 +483 @@
 # 
 # Parted gives info in MB
+# (depending on versions - 1.6.25.1 provides suffixes)
 #
 sub get_parted {
@@ -493 +491 @@
 my $end = shift;
 my $type = shift;
-my $flags = shift;
+my $void;
 my $d;
 my $n;
+my $ret;
+my $mode;
+my $size;
+
+open (PARTED, "$parted -v |") || die "Unable to read from $parted";
+$d = <PARTED>;
+print FLOG "$d";
+close(PARTED);
 
 open (PARTED, "$parted -s $device print |") || die "Unable to read from $parted";
@@ -502 +508 @@
 $d = <PARTED>;
 $d = <PARTED>;
+
+# depending on parted version, information given change:
+if ($d =~ /\bSize\b/) {
+    # SLES 10 parted >= 1.6.25
+    $mode=1;
+} else {
+    # RHEL 3 parted <= 1.6.3
+    $mode=0;
+}
+print FLOG "mode: $mode\n";
 print FLOG "Got from parted: \n";
-print FLOG "Minor    Start       End     Filesystem                        Flags\n";
+print FLOG "Minor    Start       End     Filesystem\n";
 # Get info from each partition line
 while (($n,$d) = split(/\s/, <PARTED>,2)) {
@@ -510 +526 @@
     $d =~ s/^\s*//;
     $d =~ s/\s+/ /g;
-    ($$start{$n},$$end{$n},$$type{$n},$$flags{$n}) = split(/ /,$d);
+    if ($mode == 0) {
+        ($$start{$n},$$end{$n},$$type{$n},$void) = split(/ /,$d);
+    } elsif ($mode == 1) {
+        ($$start{$n},$$end{$n},$size,$$type{$n},$void) = split(/ /,$d);
+    } 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});
-    $$flags{$n} = "" if (not defined $$flags{$n});
-    print FLOG "$n      $$start{$n}      $$end{$n}     $$type{$n}  $$flags{$n}\n";
+    # Handles potential suffixes in latest parted version. Return MB
+    $ret = decode_Bsuf($$start{$n},1048576);
+    $$start{$n} = $ret;
+    $ret = decode_Bsuf($$end{$n},1048576);
+    $$end{$n} = $ret;
+    print FLOG "$n      $$start{$n}      $$end{$n}     $$type{$n}\n";
 }
 close(PARTED);
 }
+
+sub decode_Bsuf {
+
+my $size  = shift;
+my $unit  = shift;
+my $ret = 0;
+
+#print FLOG "decode_Bsuf input: $size / $unit ";
+if ($size =~ /KB$/i) {
+    $size =~ s/KB$//i;
+    $size *= 1024;
+} elsif ($size =~ /MB$/i) {
+    $size =~ s/MB$//i;
+    $size *= 1048576;
+} elsif ($size =~ /GB$/i) {
+    $size =~ s/GB$//i;
+    $size *= 1073741824;
+} elsif ($size =~ /TB$/i) {
+    $size =~ s/TB$//i;
+    $size *= 1099511627776;
+} else {
+    # Nothing to do
+}
+$ret = $size / $unit;
+#print FLOG " - output : $size => $ret\n";
+return($ret);
+}
+
 
 # Based on Version 2.4  27-Sep-1996  Charles Bailey  bailey@genetics.upenn.edu