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

[Michael Tautschnig]

Author: mt
Date: 2010-09-30 10:57:00 +0000 (Thu, 30 Sep 2010)
New Revision: 6087

Modified:
   branches/experimental/patches/setup-storage_preserve-format-all
Log:
Don't mark extended partitions as preserve, even if preserve_*:all is in effect


Modified: branches/experimental/patches/setup-storage_preserve-format-all
===================================================================
--- branches/experimental/patches/setup-storage_preserve-format-all	2010-09-29 09:09:33 UTC (rev 6086)
+++ branches/experimental/patches/setup-storage_preserve-format-all	2010-09-30 10:57:00 UTC (rev 6087)
@@ -36,20 +36,13 @@
    # create a primary partition
    if ($type eq "primary") {
  
-@@ -259,14 +269,15 @@
- 
-       # add the preserve = 0 flag, if it doesn't exist already
-       defined ($part_size->{preserve})
--        or $part_size->{preserve} = 0;
-+        or $part_size->{preserve} = $preserve_default;
- 
-       # add the always_format = 0 flag, if it doesn't exist already
+@@ -265,8 +275,9 @@
        defined ($part_size->{always_format})
--        or $part_size->{always_format} = 0;
-+        or $part_size->{always_format} = $always_format_default;
+         or $part_size->{always_format} = 0;
  
-       # add the resize = 0 flag, if it doesn't exist already
+-      # add the resize = 0 flag, if it doesn't exist already
 -      defined ($part_size->{resize}) or $part_size->{resize} = 0;
++      # add the resize = default flag, if it doesn't exist already
 +      defined ($part_size->{resize})
 +        or $part_size->{resize} = $resize_default;
      }