[Fai-commit] r5042 - trunk/lib/setup-storage

[mt at alioth.debian.org]

Author: mt
Date: 2008-08-12 07:51:14 +0000 (Tue, 12 Aug 2008)
New Revision: 5042

Modified:
   trunk/lib/setup-storage/Init.pm
Log:
fixed bug in return values of phys_dev() (closes: #494784)


Modified: trunk/lib/setup-storage/Init.pm
===================================================================
--- trunk/lib/setup-storage/Init.pm	2008-08-11 16:33:20 UTC (rev 5041)
+++ trunk/lib/setup-storage/Init.pm	2008-08-12 07:51:14 UTC (rev 5042)
@@ -165,13 +165,13 @@
   my ($dev) = @_;
   if ($dev =~ m{^/dev/(i2o/hd[a-t]|sd[a-t]{1,2}|hd[a-t])(\d+)?$})
   {
-    defined($2) or return (1, $1, -1);
+    defined($2) or return (1, "/dev/$1", -1);
     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, "/dev/$1", -1);
-    return (1, $1, $2);
+    return (1, "/dev/$1", $2);
   }
   return (0, "", -2);
 }