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

[Michael Tautschnig]

Author: mt
Date: 2010-04-16 18:29:27 +0000 (Fri, 16 Apr 2010)
New Revision: 5771

Modified:
   branches/experimental/patches/setup-storage_lvm-preserve2
Log:
fixed bug in preserve-handling for LVM; a strange no, don't really know why I
had this "last;" in there.


Modified: branches/experimental/patches/setup-storage_lvm-preserve2
===================================================================
--- branches/experimental/patches/setup-storage_lvm-preserve2	2010-04-15 13:37:17 UTC (rev 5770)
+++ branches/experimental/patches/setup-storage_lvm-preserve2	2010-04-16 18:29:27 UTC (rev 5771)
@@ -178,7 +178,7 @@
          defined ($part->{size}->{range}) or die
            "Can't preserve ". &FAI::make_device_name($1, $part->{number})
              . " because it is not defined in the current config\n";
-@@ -493,6 +504,8 @@
+@@ -493,10 +504,11 @@
            if (2 == $FAI::configs{$config}{volumes}{$l}{size}{preserve});
          next unless ($FAI::configs{$config}{volumes}{$l}{size}{preserve} == 1 ||
            $FAI::configs{$config}{volumes}{$l}{size}{resize} == 1);
@@ -187,7 +187,11 @@
          defined ($FAI::configs{$config}{volumes}{$l}{size}{range}) or die
            "Can't preserve /dev/$1/$l because it is not defined in the current config\n";
          &FAI::mark_preserve($_) foreach (keys %{ $FAI::configs{$config}{devices} });
-@@ -506,6 +519,8 @@
+-        last;
+       }
+     } elsif ($config eq "RAID") {
+       # check for volumes that need to be preserved and preserve the underlying
+@@ -506,6 +518,8 @@
            (defined($FAI::current_raid_config{$r}) ? 1 : 0)
            if (2 == $FAI::configs{$config}{volumes}{$r}{preserve});
          next unless ($FAI::configs{$config}{volumes}{$r}{preserve} == 1);