[Fai-commit] r4907 - people/michael/features/setup_harddisks_2/implementation/lib

[mt at alioth.debian.org]

Author: mt
Date: 2008-05-16 14:49:17 +0000 (Fri, 16 May 2008)
New Revision: 4907

Modified:
   people/michael/features/setup_harddisks_2/implementation/lib/fstab.pm
   people/michael/features/setup_harddisks_2/implementation/lib/init.pm
   people/michael/features/setup_harddisks_2/implementation/lib/parser.pm
Log:
preparing for RAID1 support of /boot


Modified: people/michael/features/setup_harddisks_2/implementation/lib/fstab.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/fstab.pm	2008-05-16 12:26:44 UTC (rev 4906)
+++ people/michael/features/setup_harddisks_2/implementation/lib/fstab.pm	2008-05-16 14:49:17 UTC (rev 4907)
@@ -158,7 +158,7 @@
           # set the BOOT_DEVICE and BOOT_PARTITION variables, if necessary
           $FAI::disk_var{BOOT_PARTITION} = $device_name;
           ($c =~ /^PHY_(.+)$/) or &FAI::internal_error("unexpected mismatch");
-          defined ($FAI::disk_var{BOOT_DEVICE}) or
+          defined ($FAI::disk_var{BOOT_DEVICE}) and ($FAI::disk_var{BOOT_DEVICE} ne "") or
             $FAI::disk_var{BOOT_DEVICE} = $1;
         }
   
@@ -207,7 +207,7 @@
               !defined ($FAI::disk_var{BOOT_PARTITION}))) {
           # set the BOOT_DEVICE and BOOT_PARTITION variables, if necessary
           $FAI::disk_var{BOOT_PARTITION} = $device_name;
-          defined ($FAI::disk_var{BOOT_DEVICE}) or
+          defined ($FAI::disk_var{BOOT_DEVICE}) and ($FAI::disk_var{BOOT_DEVICE} ne "") or
             $FAI::disk_var{BOOT_DEVICE} = $device_name;
         }
 
@@ -238,7 +238,7 @@
               !defined ($FAI::disk_var{BOOT_PARTITION}))) {
           # set the BOOT_DEVICE and BOOT_PARTITION variables, if necessary
           $FAI::disk_var{BOOT_PARTITION} = "$device_name";
-          defined ($FAI::disk_var{BOOT_DEVICE}) or
+          defined ($FAI::disk_var{BOOT_DEVICE}) and ($FAI::disk_var{BOOT_DEVICE} ne "") or
             $FAI::disk_var{BOOT_DEVICE} = "$device_name";
         }
 
@@ -252,6 +252,10 @@
   # cleanup the swaplist (remove leading space and add quotes)
   $FAI::disk_var{SWAPLIST} =~ s/^\s*/"/;
   $FAI::disk_var{SWAPLIST} =~ s/\s*$/"/;
+  
+  # cleanup the list of boot devices (remove leading space and add quotes)
+  $FAI::disk_var{BOOT_DEVICE} =~ s/^\s*/"/;
+  $FAI::disk_var{BOOT_DEVICE} =~ s/\s*$/"/;
 
   # sort the lines in @fstab to enable all sub mounts
   @fstab = sort { [split("\t",$a)]->[1] cmp [split("\t",$b)]->[1] } @fstab;

Modified: people/michael/features/setup_harddisks_2/implementation/lib/init.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/init.pm	2008-05-16 12:26:44 UTC (rev 4906)
+++ people/michael/features/setup_harddisks_2/implementation/lib/init.pm	2008-05-16 14:49:17 UTC (rev 4907)
@@ -61,6 +61,7 @@
 ################################################################################
 %FAI::disk_var = ();
 $FAI::disk_var{SWAPLIST} = "";
+$FAI::disk_var{BOOT_DEVICE} = "";
 
 ################################################################################
 #

Modified: people/michael/features/setup_harddisks_2/implementation/lib/parser.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/parser.pm	2008-05-16 12:26:44 UTC (rev 4906)
+++ people/michael/features/setup_harddisks_2/implementation/lib/parser.pm	2008-05-16 14:49:17 UTC (rev 4907)
@@ -378,7 +378,7 @@
           $FAI::configs{$FAI::device}{bootable} = $1;
           ($FAI::device =~ /^PHY_(.+)$/) or
             &FAI::internal_error("unexpected device name");
-          $FAI::disk_var{BOOT_DEVICE} = $1; 
+          $FAI::disk_var{BOOT_DEVICE} .= " $1"; 
         }
         | 'virtual'
         {