[Fai-commit] r6338 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2011-04-14 13:07:37 +0000 (Thu, 14 Apr 2011)
New Revision: 6338

Removed:
   branches/experimental/patches/setup-storage_deterministic-lv-ordering
Modified:
   branches/experimental/patches/series
   branches/experimental/patches/setup-storage_no-cylinder-boundaries
   branches/experimental/patches/setup-storage_preserve-format-all
Log:
Merged patch setup-storage_deterministic-lv-ordering into trunk

(more text for commit experiment)


Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2011-04-14 12:46:10 UTC (rev 6337)
+++ branches/experimental/patches/series	2011-04-14 13:07:37 UTC (rev 6338)
@@ -18,6 +18,5 @@
 setup-storage_hardcode-63-sectors
 fcopy-unchanged-uid-gid
 setup-storage_man-page-fixes
-setup-storage_deterministic-lv-ordering
 setup-storage_internals-cleanup
 make-fai-nfsroot_add-keys

Deleted: branches/experimental/patches/setup-storage_deterministic-lv-ordering
===================================================================
--- branches/experimental/patches/setup-storage_deterministic-lv-ordering	2011-04-14 12:46:10 UTC (rev 6337)
+++ branches/experimental/patches/setup-storage_deterministic-lv-ordering	2011-04-14 13:07:37 UTC (rev 6338)
@@ -1,53 +0,0 @@
-2011-03-10  Michael Tautschnig  <mt at debian.org>
-
-	* setup-storage/Parser.pm: Build an additional list of logical volumes to make
-		on-disk order of logical volumes consistent with disk_config.
-	* setup-storage/Commands.pm: Implement this order.
-Index: trunk/lib/setup-storage/Parser.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm
-@@ -806,6 +806,8 @@
-           # make sure, $2 has not been defined already
-           defined ($FAI::configs{$FAI::device}{volumes}{$2}{size}{range}) and 
-             die "Logical volume $2 has been defined already.\n";
-+          # add to ordered list
-+          push @{ $FAI::configs{$FAI::device}{ordered_lv_list} }, $2;
-           # initialise the new hash
-           defined($FAI::configs{$FAI::device}{volumes}{$2}) or
-             $FAI::configs{$FAI::device}{volumes}{$2} = {};
-@@ -859,6 +861,8 @@
-             $FAI::configs{$FAI::device}{volumes} = {};
-           # initialise the list of physical devices
-           $FAI::configs{$FAI::device}{devices} = ();
-+          # initialise the ordered list of volumes
-+          $FAI::configs{$FAI::device}{ordered_lv_list} = ();
-           # init device tree
-           $FAI::dev_children{$FAI::device} = ();
-           # the rule must not return undef
-@@ -1142,6 +1146,12 @@
-       }
-     } elsif ($config =~ /^VG_(.+)$/) {
-       next if ($1 eq "--ANY--");
-+      (scalar(keys %{ $FAI::configs{$config}{volumes} }) ==
-+        scalar(@{ $FAI::configs{$config}{ordered_lv_list} })) or
-+        &FAI::internal_error("Inconsistent LV lists - missing entries");
-+      defined($FAI::configs{$config}{volumes}{$_}) or
-+        &FAI::internal_error("Inconsistent LV lists - missing entries")
-+        foreach (@{ $FAI::configs{$config}{ordered_lv_list} });
-       foreach my $p (keys %{ $FAI::configs{$config}{volumes} }) {
-         my $this_mp = $FAI::configs{$config}{volumes}{$p}{mountpoint};
-         next if ($this_mp eq "-");
-Index: trunk/lib/setup-storage/Commands.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Commands.pm
-+++ trunk/lib/setup-storage/Commands.pm
-@@ -523,7 +523,7 @@
-   my $vg = $1; # the actual volume group
- 
-   # now create or resize the configured logical volumes
--  foreach my $lv (keys %{ $FAI::configs{$config}{volumes} }) {
-+  foreach my $lv (@{ $FAI::configs{$config}{ordered_lv_list} }) {
-     # reference to the size of the current logical volume
-     my $lv_size = (\%FAI::configs)->{$config}->{volumes}->{$lv}->{size};
-     # skip preserved partitions, but ensure that they exist

Modified: branches/experimental/patches/setup-storage_no-cylinder-boundaries
===================================================================
--- branches/experimental/patches/setup-storage_no-cylinder-boundaries	2011-04-14 12:46:10 UTC (rev 6337)
+++ branches/experimental/patches/setup-storage_no-cylinder-boundaries	2011-04-14 13:07:37 UTC (rev 6338)
@@ -260,7 +260,7 @@
  
      volume: /^vg\s+/ name devices vgcreateopt(s?)
          | /^raid([0156]|10)\s+/
-@@ -787,7 +791,7 @@
+@@ -791,7 +795,7 @@
            1;
          }
  
@@ -269,7 +269,7 @@
          {
            # complete the size specification to be a range in all cases
            my $range = $1;
-@@ -818,7 +822,7 @@
+@@ -822,7 +826,7 @@
              $FAI::configs{$FAI::device}{preserveparts} = 1;
            }
          }
@@ -278,7 +278,7 @@
          {
            # complete the range by assuming 0 as the lower limit 
            my $range = "0$1";
-@@ -839,7 +843,7 @@
+@@ -843,7 +847,7 @@
          }
          | <error: invalid partition size near "$text">
  

Modified: branches/experimental/patches/setup-storage_preserve-format-all
===================================================================
--- branches/experimental/patches/setup-storage_preserve-format-all	2011-04-14 12:46:10 UTC (rev 6337)
+++ branches/experimental/patches/setup-storage_preserve-format-all	2011-04-14 13:07:37 UTC (rev 6338)
@@ -331,7 +331,7 @@
            # set the reference to the current volume
            # the reference is used by all further processing of this config line
            $FAI::partition_pointer = (\%FAI::configs)->{RAID}->{volumes}->{$vol_id};
-@@ -739,13 +809,17 @@
+@@ -741,13 +811,17 @@
            # initialise the new hash
            defined($FAI::configs{$FAI::device}{volumes}{$2}) or
              $FAI::configs{$FAI::device}{volumes}{$2} = {};