Changeset 89 in MondoRescue for trunk/mindi

Timestamp:

Oct 27, 2005, 10:45:34 PM (20 years ago)

Author:

bcornec

Message:

merge r87:88 of the 2.04_berlios branch
indent some files

File:

• trunk/mindi/parted2fdisk.pl (modified) (18 diffs)

trunk/mindi/parted2fdisk.pl

@@ -1 +1 @@
 #!/usr/bin/perl -w
 #
+# $Id$
+#
 # parted2fdisk: fdisk like interface for parted 
-# [developped for mindi/mondo http://www.mondorescue.org]
+# [developped for mindi/mondo http://mondorescue.berlios.de]
 #
 # Aims to be architecture independant (i386/ia64)
@@ -34 +36 @@
 my %flags;
 my $arch;
+my $fake = 0;
 
 # Determine on which arch we're running
@@ -57 +60 @@
 my $args = "";
 my $device = "";
+my $endmax = "";
 
 if ($#ARGV < 0) {
@@ -104 +108 @@
 }
 
+if ($args =~ /-n/) {
+    print FLOG "Fake mode. Nothing will be really done\n";
+    $fake = 1;
+}
+
 print FLOG "Called with device $device and arg $args\n";
 
@@ -117 +126 @@
         } elsif ($args =~ /-s/) {
             fdisk_list($device,$wpart,\%start,\%end);
-        } elsif ($args =~ /-/) {
+        } elsif (($args =~ /-/) and ($fake == 0)) {
             printf FLOG "Option not supported ($args) ...\n";
             printf FLOG "Please report to the author\n";
@@ -134 +143 @@
                         print FLOG "Forcing GPT type of disk label\n";
                         print FLOG "mklabel gpt\n";
-                        system "$parted -s $device mklabel gpt\n";
+                        system "$parted -s $device mklabel gpt\n" if ($fake != 0);
                         $type = "gpt";
                     }
@@ -160 +169 @@
                         }
                     }
+                    $start = 1 if ($start < 1);
                     print FLOG "start cyl : $start\n";
+                    $un = get_un($device);
+                    # parted needs MB
+                    $start = $start * $un / 1048576;
+                    # this is a size in B/KB/MB/GB
+                    $endmax = get_max($device);
                     $end = <STDIN>;
                     chomp($end);
                     if ((not (defined $end)) || ($end eq "")) {
                         print FLOG "no end cyl given for creation... assuming full disk)\n";
-                        $end = get_max($device);
-                    }
-                    $un = get_un($device);
+                        $end = $endmax;
+                    }
                     # Handles end syntaxes (+, K, M, ...)
+                    # to give cylinders
                     if ($end =~ /^\+/) {
                         $end =~ s/^\+//;
@@ -181 +196 @@
                             $end *= 1000000000;
                         }
+                        # This gives the number of cyl
                         $end /= $un;
-                        $end = int($end)+1;
+                        $end = sprintf("%d",$end);
                         $end += $start - 0.001;
+                        # We now have the end cyl
                     }
                     print FLOG "end cyl : $end\n";
-                    print FLOG "n $l $part $start $end => mkpart primary $start $end\n";
-                    system "$parted -s $device mkpart primary ext2 $start $end\n";
+                    # parted needs MB
+                    $end = $end * $un / 1048576;
+                    $end = $endmax if ($end > $endmax); 
+                    print FLOG "n $l $part => mkpart primary $start $end\n";
+                    system "$parted -s $device mkpart primary ext2 $start $end\n" if ($fake != 0);
                 }
                 elsif ($i =~ /^d$/) {
@@ -197 +217 @@
                     chomp($part);
                     print FLOG "d $part => rm $part\n";
-                    system "$parted -s $device rm $part\n";
+                    system "$parted -s $device rm $part\n" if ($fake != 0);
                     get_parted($device,undef,\%start,\%end,undef,undef);
                 }
@@ -221 +241 @@
                     }
                     print FLOG "t $part => mkfs $part $pnum{$l}\n";
-                    system "$parted -s $device mkfs $part $pnum{$l}\n";
+                    system "$parted -s $device mkfs $part $pnum{$l}\n" if ($fake != 0);
                 }
                 elsif ($i =~ /^a$/) {
@@ -231 +251 @@
                     chomp($part);
                     print FLOG "a $part => set $part boot on\n";
-                    system "$parted -s $device set $part boot on\n";
+                    system "$parted -s $device set $part boot on\n" if ($fake != 0);
                 }
                 elsif ($i =~ /^q$/) {
@@ -323 +343 @@
 
 my $un;
+my $endmax;
 my $d;
 my $n;
@@ -367 +388 @@
 # Keep Fdisk headers
 #
+# this will return bytes
 $un = get_un ($device,$wpart);
+$endmax = get_max($device);
+# This will return MB
 get_parted ($device,$start,$end,\%type,\%flags);
 
@@ -373 +397 @@
     # Print infos fdisk like
     $part = ${device}.$n;
-    $mstart = sprintf("%d",int($$start{$n}));
-    $mend = sprintf("%d",int($$end{$n}));
-    $length = sprintf("%d",($mend-$mstart+1)*$un/1048576);
+    # start and end are in cylinder in fdisk format
+    # so return in MB * 1MB / what represents 1 cyl in B
+    $mstart = sprintf("%d",$$start{$n}*1048576/$un);
+    $mstart = 1 if ($mstart < 1);
+    $mend = sprintf("%d",$$end{$n}*1048576/$un - 1);
+    $mend = $endmax if ($mend > $endmax);
+    # length is in 1K blocks
+    $length = sprintf("%d",($mend-$mstart+1)*$un/1024);
     $pid = $pid{$type{$n}};
     $cmt = $cmt{$type{$n}};
@@ -404 +433 @@
     } else {
         # manage the -s option of fdisk here
-        my $s = int(eval("$length/1048576*$un*1024"));
-        print "$s\n" if ($part eq $wpart);
-        print FLOG "$part has $s Bytes\n" if ($part eq $wpart);
+        print "$length\n" if ($part eq $wpart);
+        print FLOG "$part has $length KBytes\n" if ($part eq $wpart);
     }
 }
@@ -424 +452 @@
 open (FDISK, "$fdisk -l $device |") || die "Unable to read from $fdisk";
 while (<FDISK>) {
-    if ($_ =~ /^Disk/) {
-        ($foo, $un , $foo) = split /=/;
-        $max =~ s/.*sectors,([0-9]+) cylinders/$1/g;
-        $max = eval($max);
+    if ($_ =~ /heads/) {
+        chomp;
+        $max = $_;
+        $max =~ s/.* ([0-9]+) cylinders/$1/;
     }
 }
@@ -436 +464 @@
 
 # 
-# Get units from fdisk
+# Get units from fdisk (cylinder size)
 #
 sub get_un {
@@ -459 +487 @@
 }
 
+# 
+# Parted gives info in MB
+#
 sub get_parted {