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

[Michael Tautschnig]

Author: mt
Date: 2010-09-24 21:22:52 +0000 (Fri, 24 Sep 2010)
New Revision: 6077

Modified:
   branches/experimental/patches/setup-storage_no-useless-rebuild
   branches/experimental/patches/setup-storage_preserve-format-all
   branches/experimental/patches/setup-storage_raw-disk
Log:
Updated experimental patches to match current trunk


Modified: branches/experimental/patches/setup-storage_no-useless-rebuild
===================================================================
--- branches/experimental/patches/setup-storage_no-useless-rebuild	2010-09-24 12:19:50 UTC (rev 6076)
+++ branches/experimental/patches/setup-storage_no-useless-rebuild	2010-09-24 21:22:52 UTC (rev 6077)
@@ -7,7 +7,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
-@@ -860,6 +860,12 @@
+@@ -870,6 +870,12 @@
  
    # the list of partitions that must be preserved
    my @to_preserve = &FAI::get_preserved_partitions($config);
@@ -20,7 +20,7 @@
  
    my $label = $FAI::configs{$config}{disklabel};
    $label = "gpt" if ($label eq "gpt-bios");
-@@ -870,10 +876,10 @@
+@@ -880,10 +886,10 @@
      or die "Can't change disklabel, partitions are to be preserved\n";
  
    # write the disklabel to drop the previous partition table

Modified: branches/experimental/patches/setup-storage_preserve-format-all
===================================================================
--- branches/experimental/patches/setup-storage_preserve-format-all	2010-09-24 12:19:50 UTC (rev 6076)
+++ branches/experimental/patches/setup-storage_preserve-format-all	2010-09-24 21:22:52 UTC (rev 6077)
@@ -315,7 +315,7 @@
          }
          | /^align-at:(\d+[kMGTPiB]*)/
          {
-@@ -604,9 +673,14 @@
+@@ -604,12 +673,14 @@
            $FAI::configs{RAID}{volumes}{$vol_id}{mode} = $1;
            # initialise the hash of devices
            $FAI::configs{RAID}{volumes}{$vol_id}{devices} = {};
@@ -323,16 +323,18 @@
 +          # initialise the flags
            defined($FAI::configs{RAID}{volumes}{$vol_id}{preserve}) or
 -            $FAI::configs{RAID}{volumes}{$vol_id}{preserve} = 0;
+-          # initialise the always_format flag
 +            $FAI::configs{RAID}{volumes}{$vol_id}{preserve} =
 +              defined($FAI::configs{RAID}{opts_all}{preserve}) ? 1 :
 +                (defined($FAI::configs{RAID}{opts_all}{preserve_lazy}) ? 2 : 0);
-+          defined($FAI::configs{RAID}{volumes}{$vol_id}{always_format}) or
+           defined($FAI::configs{RAID}{volumes}{$vol_id}{always_format}) or
+-            $FAI::configs{RAID}{volumes}{$vol_id}{always_format} = 0;
 +            $FAI::configs{RAID}{volumes}{$vol_id}{always_format} =
 +              defined($FAI::configs{RAID}{opts_all}{always_format}) ? 1 : 0;
            # 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};
-@@ -677,13 +751,17 @@
+@@ -680,13 +751,17 @@
            # initialise the new hash
            defined($FAI::configs{$FAI::device}{volumes}{$2}) or
              $FAI::configs{$FAI::device}{volumes}{$2} = {};

Modified: branches/experimental/patches/setup-storage_raw-disk
===================================================================
--- branches/experimental/patches/setup-storage_raw-disk	2010-09-24 12:19:50 UTC (rev 6076)
+++ branches/experimental/patches/setup-storage_raw-disk	2010-09-24 21:22:52 UTC (rev 6077)
@@ -7,7 +7,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
-@@ -1084,14 +1084,15 @@
+@@ -1094,14 +1094,15 @@
  
      if ($FAI::configs{$config}{virtual}) {
        foreach my $part_id (&numsort(keys %{ $FAI::configs{$config}{partitions} })) {
@@ -25,7 +25,7 @@
      } else {
        # create partitions on non-virtual configs
        &FAI::setup_partitions($config);
-@@ -1108,7 +1109,7 @@
+@@ -1118,7 +1119,7 @@
          || $part->{size}->{extended} == 1);
  
        # create the filesystem on the device