[Fai-commit] r4705 - people/michael/features/setup_harddisks_2/implementation

[michael-guest at alioth.debian.org]

Author: michael-guest
Date: 2007-11-11 10:25:53 +0000 (Sun, 11 Nov 2007)
New Revision: 4705

Modified:
   people/michael/features/setup_harddisks_2/implementation/shdd2-parser
Log:
prefer /boot over / for the BOOT_PARTITION and BOOT_DEVICE


Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-parser
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-parser	2007-11-11 10:23:45 UTC (rev 4704)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-parser	2007-11-11 10:25:53 UTC (rev 4705)
@@ -536,17 +536,17 @@
         {
           # set the mount point
           $FAI::partition_pointer->{ "mountpoint" } = $item[ 1 ];
-          # mark the bootable partition, if it is not set yet and this is a PHY_
-          # device
-          if ( $item[ 1 ] eq "/" && $FAI::device =~ /^PHY_(.+)$/ &&
-            $FAI::configs{$FAI::device}{"bootable"} == -1 )
-          {
-            $FAI::configs{$FAI::device}{"bootable"} =
-              $FAI::partition_pointer->{"number"};
-            # set the BOOT_DEVICE and BOOT_PARTITION variables
-            $FAI::disk_var{ "BOOT_DEVICE" } = $1; 
-            $FAI::disk_var{ "BOOT_PARTITION" } = $1 . 
-              $FAI::configs{ $FAI::device }{ "bootable" };
+          # if the mount point is / or /boot and we are currently doing a
+          # physical device, the variables should be set, unless they are
+          # already
+          if ( $FAI::configs{$FAI::device}{"bootable"} == -1 && 
+            $FAI::device =~ /^PHY_(.+)$/ && 
+            ( $item[ 1 ] eq "/boot" || ( $item[ 1 ] eq "/" && 
+              !defined( $FAI::disk_var{ "BOOT_DEVICE" } ) ) ) ) {
+              # set the BOOT_DEVICE and BOOT_PARTITION variables
+              $FAI::disk_var{ "BOOT_DEVICE" } = $1; 
+              $FAI::disk_var{ "BOOT_PARTITION" } = $1 . 
+                $FAI::partition_pointer->{"number"};
           }
         }