[Fai-commit] r5437 - in trunk: debian lib/setup-storage

[Michael Tautschnig]

Author: mt
Date: 2009-07-19 14:36:51 +0000 (Sun, 19 Jul 2009)
New Revision: 5437

Modified:
   trunk/debian/changelog
   trunk/lib/setup-storage/Parser.pm
Log:
setup-storage_bootable patch integrated in trunk


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-07-19 14:16:51 UTC (rev 5436)
+++ trunk/debian/changelog	2009-07-19 14:36:51 UTC (rev 5437)
@@ -19,6 +19,10 @@
   * fai-savelog: cd to the right place if LOGREMOTEDIR is set, thanks to
     Robin Powell for the patch (closes: #515704)
   * fai-mirror: remove use of $addpackages (closes: #537544)
+
+  [ Michael Tautschnig ]
+  * setup-storage/Parser.pm: Set the boot flag on partition mounted at /, if
+    bootable is not explicitly set.
   
  -- Thomas Lange <lange at debian.org>  Sun, 19 Jul 2009 12:08:02 +0200
 

Modified: trunk/lib/setup-storage/Parser.pm
===================================================================
--- trunk/lib/setup-storage/Parser.pm	2009-07-19 14:16:51 UTC (rev 5436)
+++ trunk/lib/setup-storage/Parser.pm	2009-07-19 14:36:51 UTC (rev 5437)
@@ -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\-]+)}