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

[mt at alioth.debian.org]

Author: mt
Date: 2008-03-28 13:01:04 +0000 (Fri, 28 Mar 2008)
New Revision: 4854

Modified:
   people/michael/features/setup_harddisks_2/implementation/lib/parser.pm
Log:
add the additional "p" used in partition names for cciss and others


Modified: people/michael/features/setup_harddisks_2/implementation/lib/parser.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/parser.pm	2008-03-27 10:39:26 UTC (rev 4853)
+++ people/michael/features/setup_harddisks_2/implementation/lib/parser.pm	2008-03-28 13:01:04 UTC (rev 4854)
@@ -544,7 +544,10 @@
             unless ($dev =~ m{^/}) {
               if ($dev =~ m/^disk(\d+)\.(\d+)/) {
                 my $short_dev = $FAI::disks[ $1 - 1 ];
-                $dev = "/dev/$short_dev$2";
+                my $part_no = $2;
+                $dev = "/dev/$short_dev";
+                if ($dev =~ m{^/dev/(cciss/c\dd\dp|ida/c\dd\dp|rd/c\dd\dp|ataraid/d\dp)$}) $dev = "${dev}p";
+                $dev = "$dev$part_no";
               } else {
                 $dev = "/dev/$dev";
               }