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

[mt at alioth.debian.org]

Author: mt
Date: 2008-04-22 16:01:19 +0000 (Tue, 22 Apr 2008)
New Revision: 4872

Modified:
   people/michael/features/setup_harddisks_2/implementation/lib/commands.pm
   people/michael/features/setup_harddisks_2/implementation/lib/fstab.pm
Log:
fixed bugs noted by Christopher, thanks!


Modified: people/michael/features/setup_harddisks_2/implementation/lib/commands.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/commands.pm	2008-04-17 17:58:15 UTC (rev 4871)
+++ people/michael/features/setup_harddisks_2/implementation/lib/commands.pm	2008-04-22 16:01:19 UTC (rev 4872)
@@ -95,7 +95,7 @@
   
   my ($device, $partition) = @_;
 
-  return $device unless $part->{encrypt};
+  return $device unless $partition->{encrypt};
 
   # encryption requested, rewrite the device name
   my $enc_dev_name = $device;

Modified: people/michael/features/setup_harddisks_2/implementation/lib/fstab.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/fstab.pm	2008-04-17 17:58:15 UTC (rev 4871)
+++ people/michael/features/setup_harddisks_2/implementation/lib/fstab.pm	2008-04-22 16:01:19 UTC (rev 4872)
@@ -207,11 +207,10 @@
         # according to http://grub.enbug.org/LVMandRAID, this should work...
         # if the mount point is / or /boot, the variables should be set, unless
         # they are already
-        if ($p_ref->{mountpoint} eq "/boot" || ($p_ref->{mountpoint} eq "/" && 
+        if ($l_ref->{mountpoint} eq "/boot" || ($l_ref->{mountpoint} eq "/" && 
               !defined ($FAI::disk_var{BOOT_PARTITION}))) {
           # 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
             $FAI::disk_var{BOOT_DEVICE} = $device_name;
         }
@@ -239,11 +238,10 @@
         # according to http://grub.enbug.org/LVMandRAID, this should work...
         # if the mount point is / or /boot, the variables should be set, unless
         # they are already
-        if ($p_ref->{mountpoint} eq "/boot" || ($p_ref->{mountpoint} eq "/" && 
+        if ($r_ref->{mountpoint} eq "/boot" || ($r_ref->{mountpoint} eq "/" && 
               !defined ($FAI::disk_var{BOOT_PARTITION}))) {
           # 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");
+          $FAI::disk_var{BOOT_PARTITION} = "$device_name";
           defined ($FAI::disk_var{BOOT_DEVICE}) or
             $FAI::disk_var{BOOT_DEVICE} = "$device_name";
         }