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

[mt at alioth.debian.org]

Author: mt
Date: 2008-05-09 12:09:32 +0000 (Fri, 09 May 2008)
New Revision: 4885

Modified:
   people/michael/features/setup_harddisks_2/implementation/lib/init.pm
   people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm
Log:
$disk was not a full path name


Modified: people/michael/features/setup_harddisks_2/implementation/lib/init.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/init.pm	2008-05-09 11:42:57 UTC (rev 4884)
+++ people/michael/features/setup_harddisks_2/implementation/lib/init.pm	2008-05-09 12:09:32 UTC (rev 4885)
@@ -136,11 +136,11 @@
   if ($dev =~ m{^/dev/(i2o/hd[a-t]|sd[a-t]|hd[a-t])(\d+)?$})
   {
     defined($2) or return (1, $1, -1);
-    return (1, $1, $2);
+    return (1, "/dev/$1", $2);
   }
   elsif ($dev =~ m{^/dev/(cciss/c\dd\d|ida/c\dd\d|rd/c\dd\d|ataraid/d\d)p(\d+)?$})
   {
-    defined($2) or return (1, $1, -1);
+    defined($2) or return (1, "/dev/$1", -1);
     return (1, $1, $2);
   }
   return (0, "", -2);

Modified: people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm	2008-05-09 11:42:57 UTC (rev 4884)
+++ people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm	2008-05-09 12:09:32 UTC (rev 4885)
@@ -107,11 +107,6 @@
 
   # try a partition
   elsif (1 == $i_p_d && $part_no > -1) {
-    use Data::Dumper;
-    # print the current contents of $FAI::configs
-    $FAI::debug and print "Desired disk layout for estimate DISK$disk N$part_no\n";
-    $FAI::debug and print Dumper \%{ $FAI::configs{"PHY_$disk"}{partitions}{$part_no} };
-
     # the size is configured, return it
     defined ($FAI::configs{"PHY_$disk"}{partitions}{$part_no}{size}{eff_size})
       and return $FAI::configs{"PHY_$disk"}{partitions}{$part_no}{size}{eff_size} /