[Fai-commit] r5328 - people/michael/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2009-04-15 21:16:16 +0000 (Wed, 15 Apr 2009)
New Revision: 5328

Removed:
   people/michael/experimental/patches/setup-storage_cylinder-boundary
   people/michael/experimental/patches/setup-storage_fs-tool-check
Modified:
   people/michael/experimental/patches/series
   people/michael/experimental/patches/setup-storage_gpt-bios
Log:
Removed patches that were merged into trunk, updated patch line numbers


Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-04-15 21:14:26 UTC (rev 5327)
+++ people/michael/experimental/patches/series	2009-04-15 21:16:16 UTC (rev 5328)
@@ -13,7 +13,5 @@
 bugfix-520554
 bugfix-521027
 setup-storage_missing-raid-devs
-setup-storage_cylinder-boundary
-setup-storage_fs-tool-check
 bugfix-504813
 bugfix-506463

Deleted: people/michael/experimental/patches/setup-storage_cylinder-boundary
===================================================================
--- people/michael/experimental/patches/setup-storage_cylinder-boundary	2009-04-15 21:14:26 UTC (rev 5327)
+++ people/michael/experimental/patches/setup-storage_cylinder-boundary	2009-04-15 21:16:16 UTC (rev 5328)
@@ -1,24 +0,0 @@
-2009-04-01  Michael Tautschnig  <mt at debian.org>
-
-	* setup-storage/Sizes.pm: Change die to warn in case a preserved partition is
-		not aligned to cylinder boundaries (Thomas said this was ok...)
-Index: trunk/lib/setup-storage/Sizes.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Sizes.pm
-+++ trunk/lib/setup-storage/Sizes.pm	
-@@ -323,11 +323,14 @@
-   if ($FAI::configs{$config}{disklabel} eq "msdos") {
- 
-     # make sure the partition ends at a cylinder boundary
-+    # maybe we should make this a warning if ($curr_part->{filesystem} eq
-+    # "ntfs")) only, but for now just a warning for everyone; well, it might
-+    # also be safe to ignore this, don't know for sure.
-     (0 == ($curr_part->{end_byte} + 1)
-         % ($current_disk->{sector_size} *
-           $current_disk->{bios_sectors_per_track} *
-           $current_disk->{bios_heads})) or 
--      die "Preserved partition $part_id does not end at a cylinder boundary\n";
-+      warn "Preserved partition $part_id does not end at a cylinder boundary, parted may fail to restore the partition!\n";
- 
-     # add one head of disk usage if this is a logical partition
-     $min_req_total_space += $current_disk->{bios_sectors_per_track} *

Deleted: people/michael/experimental/patches/setup-storage_fs-tool-check
===================================================================
--- people/michael/experimental/patches/setup-storage_fs-tool-check	2009-04-15 21:14:26 UTC (rev 5327)
+++ people/michael/experimental/patches/setup-storage_fs-tool-check	2009-04-15 21:16:16 UTC (rev 5328)
@@ -1,28 +0,0 @@
-2009-04-01  Michael Tautschnig  <mt at debian.org>
-
-	* setup-storage/Parser.pm: Only test for mkfs.X if such a filesystem is to be
-		created (i.e., it will not be preserved).
-Index: trunk/lib/setup-storage/Parser.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm	
-@@ -666,9 +666,17 @@
-         }
-         | /^\S+/
-         {
--          &FAI::in_path("mkfs.$item[1]") or 
--            die "unknown/invalid filesystem type $item[1] (mkfs.$item[1] not found in PATH)\n";
-           $FAI::partition_pointer->{filesystem} = $item[ 1 ];
-+          my $to_be_preserved = 0;
-+          if ($FAI::device eq "RAID") {
-+            $to_be_preserved = $FAI::partition_pointer->{preserve};
-+          } else {
-+            $to_be_preserved = $FAI::partition_pointer->{size}->{preserve};
-+          }
-+          if (0 == $to_be_preserved) {
-+            &FAI::in_path("mkfs.$item[1]") or
-+              die "unknown/invalid filesystem type $item[1] (mkfs.$item[1] not found in PATH)\n";
-+          }
-         }
- 
-     vgcreateopt: /pvcreateopts="([^"]*)"/

Modified: people/michael/experimental/patches/setup-storage_gpt-bios
===================================================================
--- people/michael/experimental/patches/setup-storage_gpt-bios	2009-04-15 21:14:26 UTC (rev 5327)
+++ people/michael/experimental/patches/setup-storage_gpt-bios	2009-04-15 21:16:16 UTC (rev 5328)
@@ -74,7 +74,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Sizes.pm
 +++ trunk/lib/setup-storage/Sizes.pm	
-@@ -350,7 +350,8 @@
+@@ -353,7 +353,8 @@
    }
  
    # on gpt, ensure that the partition ends at a sector boundary
@@ -84,7 +84,7 @@
      (0 == ($current_disk->{partitions}{$part_id}{end_byte} + 1)
          % $current_disk->{sector_size})
        or die "Preserved partition $part_id does not end at a sector boundary\n";
-@@ -545,7 +546,8 @@
+@@ -548,7 +549,8 @@
    }
  
    # on gpt, ensure that the partition ends at a sector boundary
@@ -94,7 +94,7 @@
      $end_byte -=
        ($end_byte + 1) % $current_disk->{sector_size};
    }
-@@ -618,18 +620,17 @@
+@@ -621,18 +623,17 @@
      # the start byte for the next partition
      my $next_start = 0;
  
@@ -116,7 +116,7 @@
        $next_start = 34 * $current_disk->{sector_size};
  
        # modify the disk to claim the space for the second partition table
-@@ -637,6 +638,24 @@
+@@ -640,6 +641,24 @@
  
        # the space required by the GPTs
        $min_req_total_space += 2 * 34 * $current_disk->{sector_size};
@@ -141,7 +141,7 @@
      }
  
      # the list of partitions that we need to find start and end bytes for
-@@ -687,7 +706,7 @@
+@@ -690,7 +709,7 @@
  
          # msdos does not support partitions larger than 2TB
          ($part->{size}->{eff_size} > (&FAI::convert_unit("2TB") * 1024.0 *