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

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

Author: michael-guest
Date: 2006-07-21 22:06:18 +0000 (Fri, 21 Jul 2006)
New Revision: 3583

Added:
   people/michael/features/setup_harddisks_2/implementation/shdd2-commands
   people/michael/features/setup_harddisks_2/implementation/shdd2-exec
   people/michael/features/setup_harddisks_2/implementation/shdd2-fstab
   people/michael/features/setup_harddisks_2/implementation/shdd2-sizes
Modified:
   people/michael/features/setup_harddisks_2/implementation/shdd2
   people/michael/features/setup_harddisks_2/implementation/shdd2-parser
Log:
initial script locations, bug fixes


Modified: people/michael/features/setup_harddisks_2/implementation/shdd2
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2	2006-07-21 22:05:33 UTC (rev 3582)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2	2006-07-21 22:06:18 UTC (rev 3583)
@@ -3,4 +3,8 @@
 use strict;
 
 require "shdd2-parser";
+require "shdd2-sizes";
+require "shdd2-commands";
+require "shdd2-fstab";
+require "shdd2-exec";
 

Added: people/michael/features/setup_harddisks_2/implementation/shdd2-commands
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-commands	2006-07-21 22:05:33 UTC (rev 3582)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-commands	2006-07-21 22:06:18 UTC (rev 3583)
@@ -0,0 +1,8 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+package FAI;
+
+1;
+


Property changes on: people/michael/features/setup_harddisks_2/implementation/shdd2-commands
___________________________________________________________________
Name: svn:executable
   + *

Added: people/michael/features/setup_harddisks_2/implementation/shdd2-exec
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-exec	2006-07-21 22:05:33 UTC (rev 3582)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-exec	2006-07-21 22:06:18 UTC (rev 3583)
@@ -0,0 +1,8 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+package FAI;
+
+1;
+


Property changes on: people/michael/features/setup_harddisks_2/implementation/shdd2-exec
___________________________________________________________________
Name: svn:executable
   + *

Added: people/michael/features/setup_harddisks_2/implementation/shdd2-fstab
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-fstab	2006-07-21 22:05:33 UTC (rev 3582)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-fstab	2006-07-21 22:06:18 UTC (rev 3583)
@@ -0,0 +1,8 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+package FAI;
+
+1;
+


Property changes on: people/michael/features/setup_harddisks_2/implementation/shdd2-fstab
___________________________________________________________________
Name: svn:executable
   + *

Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-parser
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-parser	2006-07-21 22:05:33 UTC (rev 3582)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-parser	2006-07-21 22:06:18 UTC (rev 3583)
@@ -92,10 +92,8 @@
 @FAI::disks = split(/\n/, $ENV{disklist});
 
 %FAI::configs = ();
-$FAI::config_pointer;
 
 $FAI::device = "";
-$FAI::partition_pointer;
 $FAI::partition_primary_counter = 0;
 $FAI::partition_logical_counter = 0;
 
@@ -140,12 +138,12 @@
             {
               die "Duplicate configuration for disk $FAI::disks[ $1-1 ]\n";
             }
-            $FAI::configs{ $FAI::device } = (
+            $FAI::configs{ $FAI::device } = {
               "virtual" => 0,
               "disklabel" => "msdos",
               "bootable" => -1,
               "partitions" => ()
-            );
+            };
           }
           else
           {
@@ -167,21 +165,21 @@
           {
             die "Duplicate configuration for disk $FAI::disks[ $1-1 ]\n";
           }
-          $FAI::configs{ $FAI::device } = (
+          $FAI::configs{ $FAI::device } = {
             "virtual" => 0,
             "disklabel" => "msdos",
             "bootable" => -1,
             "partitions" => ()
-          );
+          };
         }
     option: /^preserve:(\d+(,\d+)*)/
         {
           my @ids = split( ",", $1 );
           foreach my $id ( @ids )
           {
-            $FAI::configs{ $FAI::device }{ "partitions" }{ $id }{ "size" } = (
+            $FAI::configs{ $FAI::device }{ "partitions" }{ $id }{ "size" } = {
               "preserve" => 1
-            );
+            };
           }
         }
         | /^resize:(\d+(,\d+)*)/
@@ -189,9 +187,9 @@
           my @ids = split( ",", $1 );
           foreach my $id ( @ids )
           {
-            $FAI::configs{ $FAI::device }{ "partitions" }{ $id }{ "size" } = (
+            $FAI::configs{ $FAI::device }{ "partitions" }{ $id }{ "size" } = {
               "resize" => 1
-            );
+            };
           }
         }
         | /^disklabel:(msdos|sun)/
@@ -222,9 +220,9 @@
             ( $FAI::partition_primary_counter < 4 || $FAI::configs{ $FAI::device }{ "disklabel" } ne "msdos" ) or die "Too many primary partitions\n";
             $FAI::partition_primary_counter++;
             $FAI::partition_pointer = (\%FAI::configs)->{ $FAI::device }->{ "partitions" }->{ $FAI::partition_primary_counter };
-            $FAI::configs{ $FAI::device }{ "partitions" }{ $FAI::partition_primary_counter }{ "size" } = (
+            $FAI::configs{ $FAI::device }{ "partitions" }{ $FAI::partition_primary_counter }{ "size" } = {
               "extended" => 0
-            );
+            };
             $FAI::config_pointer = $FAI::configs{ $FAI::device }{ "partitions" }{ $FAI::partition_primary_counter };
           }
         }
@@ -236,9 +234,9 @@
             {
               ( $FAI::partition_primary_counter < 4 ) or die "Too many primary partitions\n";
               $FAI::partition_primary_counter++;
-              $FAI::configs{ $FAI::device }{ "partitions" }{ $FAI::partition_primary_counter }{ "size" } = (
+              $FAI::configs{ $FAI::device }{ "partitions" }{ $FAI::partition_primary_counter }{ "size" } = {
                 "extended" => 1
-              );
+              };
             }
             $FAI::partition_logical_counter++;
             $FAI::partition_pointer = (\%FAI::configs)->{ $FAI::device }->{ "partitions" }->{ $FAI::partition_primary_counter+4 };
@@ -286,9 +284,9 @@
         | /^\S+/
         {
           if ( !&FAI::in_path("$item[1]") ) 
-            {
-                 warn "unknown/invalid filesystem type '$item[1]'"
-            }
+          {
+             warn "unknown/invalid filesystem type '$item[1]'";
+          }
         }
     fs_options: /.*/
 });

Added: people/michael/features/setup_harddisks_2/implementation/shdd2-sizes
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-sizes	2006-07-21 22:05:33 UTC (rev 3582)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-sizes	2006-07-21 22:06:18 UTC (rev 3583)
@@ -0,0 +1,14 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+package FAI;
+
+foreach my $config (%FAI::configs)
+{
+  
+
+}
+
+1;
+


Property changes on: people/michael/features/setup_harddisks_2/implementation/shdd2-sizes
___________________________________________________________________
Name: svn:executable
   + *