[Fai-commit] r6707 - trunk/lib/setup-storage

[Michael Tautschnig]

Author: mt
Date: 2011-10-22 12:40:34 +0000 (Sat, 22 Oct 2011)
New Revision: 6707

Modified:
   trunk/lib/setup-storage/Sizes.pm
Log:
setup-storage/Sizes.pm: start first partition at 1M

* setup-storage/Sizes.pm: Have first partition start at 1M on all disk labels;
  this is in consistency with other partitioning tools and operating systems.
  Yet it may result in unexpected overlapping-partition errors.


Modified: trunk/lib/setup-storage/Sizes.pm
===================================================================
--- trunk/lib/setup-storage/Sizes.pm	2011-10-22 12:38:35 UTC (rev 6706)
+++ trunk/lib/setup-storage/Sizes.pm	2011-10-22 12:40:34 UTC (rev 6707)
@@ -622,27 +622,15 @@
       }
     }
 
-    # the start byte for the next partition
-    my $next_start = 0;
+    # the start byte for the next partition - first partition starts at 1M as is
+    # new default for most systems it seems
+    my $next_start = 1024 * 1024;
 
-    if ($FAI::configs{$config}{disklabel} eq "msdos") {
-      # on msdos disk labels, the first partitions starts at head #1; well,
-      # enforce a 63-sectors-per-track layout
-      $next_start = 63 * $current_disk->{sector_size};
-
-    } elsif ($FAI::configs{$config}{disklabel} eq "gpt") {
-      # on GPT-EFI disk labels the first 34 and last 33 sectors must be left alone
-      $next_start = 34 * $current_disk->{sector_size};
-
+    if ($FAI::configs{$config}{disklabel} eq "gpt") {
       # modify the disk to claim the space for the second partition table
       $current_disk->{end_byte} -= 33 * $current_disk->{sector_size};
 
     } elsif ($FAI::configs{$config}{disklabel} eq "gpt-bios") {
-      # the MBR requires space, too
-      $next_start = $current_disk->{sector_size};
-      # not too sure whether this is needed: standard GPT partition table space
-      $next_start += 33 * $current_disk->{sector_size};
-
       # apparently parted insists in having some space left at the end too
       # modify the disk to claim the space for the second partition table
       $current_disk->{end_byte} -= 33 * $current_disk->{sector_size};