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

[mt at alioth.debian.org]

Author: mt
Date: 2008-04-08 16:07:02 +0000 (Tue, 08 Apr 2008)
New Revision: 4861

Modified:
   people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm
Log:
extract the proper substrings (copy&paste error)


Modified: people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm	2008-04-08 15:36:30 UTC (rev 4860)
+++ people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm	2008-04-08 16:07:02 UTC (rev 4861)
@@ -95,7 +95,7 @@
   # try the entire disk first; we then use the data from the current
   # configuration; this matches in fact for than the allowable strings, but
   # this should be caught later on
-  if ($dev =~ m{^/dev/(i2o/hd[a-t]|cciss/c\dd\d|ida/c\dd\d|rd/c\dd\d|ataraid/d\d|sd[a-t]|hd[a-t])$}) {
+  if ($dev =~ m{^/dev/i2o/hd[a-t]|cciss/c\dd\d|ida/c\dd\d|rd/c\dd\d|ataraid/d\d|sd[a-t]|hd[a-t]$}) {
     defined ($FAI::current_config{$dev}{end_byte})
       or die "$dev is not a valid block device\n";
 
@@ -105,7 +105,7 @@
   }
 
   # try a partition
-  elsif ($dev =~ m{^/dev/(i2o/hd[a-t]|cciss/c\dd\d|ida/c\dd\d|rd/c\dd\d|ataraid/d\d|sd[a-t]|hd[a-t])p?(\d+)$}) {
+  elsif ($dev =~ m{^(/dev/i2o/hd[a-t]|cciss/c\dd\d|ida/c\dd\d|rd/c\dd\d|ataraid/d\d|sd[a-t]|hd[a-t])p?(\d+)$}) {
 
     # the size is configured, return it
     defined ($FAI::configs{"PHY_$1"}{partitions}{$2}{size}{eff_size})
@@ -168,7 +168,7 @@
 
   # otherwise we are clueless
   else {
-    die "Cannot determine size of $dev\n";
+    die "Cannot determine size of $dev - scheme unknown\n";
   }
 }