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

[mt at alioth.debian.org]

Author: mt
Date: 2008-04-08 14:04:33 +0000 (Tue, 08 Apr 2008)
New Revision: 4858

Modified:
   people/michael/features/setup_harddisks_2/implementation/lib/parser.pm
Log:
- fixed missing | to mark alternative in preserve_*
- fixed code to work with cciss et al.


Modified: people/michael/features/setup_harddisks_2/implementation/lib/parser.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/parser.pm	2008-04-04 17:49:32 UTC (rev 4857)
+++ people/michael/features/setup_harddisks_2/implementation/lib/parser.pm	2008-04-08 14:04:33 UTC (rev 4858)
@@ -353,7 +353,7 @@
           # set the preserve flag for all ids in all cases
           $FAI::configs{$FAI::device}{partitions}{$_}{size}{preserve} = 1 foreach (split (",", $1));
         }
-        /^preserve_reinstall:(\d+(,\d+)*)/
+        | /^preserve_reinstall:(\d+(,\d+)*)/
         {
           # set the preserve flag for all ids if $FAI::reinstall is set
           if ($FAI::reinstall) {
@@ -546,7 +546,7 @@
                 my $short_dev = $FAI::disks[ $1 - 1 ];
                 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}p" if ($dev =~ m{^/dev/(cciss/c\dd\d|ida/c\dd\d|rd/c\dd\d|ataraid/d\d)$});
                 $dev = "$dev$part_no";
               } else {
                 $dev = "/dev/$dev";