[Fai-commit] r3600 - people/michael/features/setup_harddisks_2/implementation

[fai-commit at lists.alioth.debian.org]

Author: michael-guest
Date: 2006-07-22 00:40:21 +0000 (Sat, 22 Jul 2006)
New Revision: 3600

Modified:
   people/michael/features/setup_harddisks_2/implementation/shdd2-parser
   people/michael/features/setup_harddisks_2/implementation/shdd2-sizes
Log:
bugfix of parser


Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-parser
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-parser	2006-07-22 00:39:12 UTC (rev 3599)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-parser	2006-07-22 00:40:21 UTC (rev 3600)
@@ -122,7 +122,7 @@
         {
           $FAI::device = "";
         }
-        | /^disk(\d+)/ option(s?)
+        | /^disk(\d+)/
         {
           if( scalar( @FAI::disks ) >= $1 )
           {
@@ -150,7 +150,8 @@
             die "this system does not have a physical $item[1] "
           }
         }
-        | /^\S+/ option(s?)
+        option(s?)
+        | /^\S+/
         {
           # check for valid device name
           if( $item[ 1 ] =~ m{^/} )
@@ -172,6 +173,7 @@
             "partitions" => {}
           };
         }
+        option(s?)
     option: /^preserve:(\d+(,\d+)*)/
         {
           my @ids = split( ",", $1 );
@@ -239,8 +241,8 @@
               };
             }
             $FAI::partition_logical_counter++;
-            $FAI::partition_pointer = (\%FAI::configs)->{ $FAI::device }->{ "partitions" }->{ $FAI::partition_primary_counter+4 };
-            $FAI::configs{ $FAI::device }{ "partitions" }{ $FAI::partition_primary_counter + 4 }{ "size" } = {
+            $FAI::partition_pointer = (\%FAI::configs)->{ $FAI::device }->{ "partitions" }->{ $FAI::partition_logical_counter+4 };
+            $FAI::configs{ $FAI::device }{ "partitions" }{ $FAI::partition_logical_counter + 4 }{ "size" } = {
               "extended" => 0
             };
           }

Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-sizes
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-sizes	2006-07-22 00:39:12 UTC (rev 3599)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-sizes	2006-07-22 00:40:21 UTC (rev 3600)
@@ -140,14 +140,14 @@
    }
    elsif( $config =~ /^PHY_(.*)$/ )
    {
-     foreach my $part_id ( keys $FAI::configs{ $config }{ "partitions" } )
+     foreach my $part_id ( keys %{ $FAI::configs{ $config }{ "partitions" } } )
      {
-       print "$part_id configured\n";
+       print "$part_id of $config configured\n";
      }
    }
    else
    {
-     die "Internal error (invalid config entry).\n";
+     warn "Internal error (invalid config entry $config).\n";
    }
 }