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

[Michael Tautschnig]

Author: mt
Date: 2009-07-19 14:39:42 +0000 (Sun, 19 Jul 2009)
New Revision: 5438

Removed:
   people/michael/experimental/patches/setup-storage_bootable
Modified:
   people/michael/experimental/patches/series
Log:
setup-storage_bootable moved to trunk


Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-07-19 14:36:51 UTC (rev 5437)
+++ people/michael/experimental/patches/series	2009-07-19 14:39:42 UTC (rev 5438)
@@ -1,5 +1,4 @@
 setup-storage_fix-secondary-gpt-size
-setup-storage_bootable
 setup-storage_ignore-gpt-warning
 logtail
 grub-pc

Deleted: people/michael/experimental/patches/setup-storage_bootable
===================================================================
--- people/michael/experimental/patches/setup-storage_bootable	2009-07-19 14:36:51 UTC (rev 5437)
+++ people/michael/experimental/patches/setup-storage_bootable	2009-07-19 14:39:42 UTC (rev 5438)
@@ -1,21 +0,0 @@
-2009-05-06  Michael Tautschnig  <mt at debian.org>
-
-	* setup-storage/Parser.pm: Set the boot flag on partition mounted at /, if
-		bootable is not explicitly set.
-Index: trunk/lib/setup-storage/Parser.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm	
-@@ -522,6 +522,12 @@
-           } else {
-             $FAI::partition_pointer->{encrypt} = 0;
-           }
-+          if ($FAI::device =~ /^PHY_(.+)$/ &&
-+            -1 == $FAI::configs{$FAI::device}{bootable} &&
-+            $FAI::partition_pointer->{mountpoint} eq "/") {
-+            $FAI::configs{$FAI::device}{bootable} =
-+              $FAI::partition_pointer->{number};
-+          }
-         }
- 
-     name: m{^([^/,\s\-]+)}