[Fai-commit] r3609 -
people/michael/features/setup_harddisks_2/implementation
fai-commit at lists.alioth.debian.org
fai-commit at lists.alioth.debian.org
Sat Jul 22 11:11:59 UTC 2006
Author: michael-guest
Date: 2006-07-22 11:11:55 +0000 (Sat, 22 Jul 2006)
New Revision: 3609
Modified:
people/michael/features/setup_harddisks_2/implementation/shdd2-parser
people/michael/features/setup_harddisks_2/implementation/shdd2-sizes
Log:
bugfixes
Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-parser
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-parser 2006-07-22 11:07:22 UTC (rev 3608)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-parser 2006-07-22 11:11:55 UTC (rev 3609)
@@ -213,6 +213,10 @@
$FAI::partition_pointer = (\%FAI::configs)->{ $FAI::device }->{ "partitions" }->{ $FAI::partition_primary_counter };
$FAI::partition_pointer->{ "size" }->{ "extended" } = 0;
$FAI::partition_pointer->{ "number" } = $FAI::partition_primary_counter;
+ if( ! defined( $FAI::partition_pointer->{ "size" }{ "preserve" } ) )
+ {
+ $FAI::partition_pointer->{ "size" }->{ "preserve" } = 0;
+ }
}
}
| 'logical'
@@ -224,12 +228,20 @@
( $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" }{ "extended" } = 1;
+ if( ! defined( $FAI::configs{ $FAI::device }{ "partitions" }{ $FAI::partition_primary_counter }{ "size" }{ "preserve" } ) )
+ {
+ $FAI::configs{ $FAI::device }{ "partitions" }{ $FAI::partition_primary_counter }{ "preserve" } = 0;
+ }
}
$FAI::partition_logical_counter++;
$FAI::configs{ $FAI::device }{ "partitions" }{ $FAI::partition_logical_counter + 4 }= {};
$FAI::partition_pointer = (\%FAI::configs)->{ $FAI::device }->{ "partitions" }->{ $FAI::partition_logical_counter + 4 };
$FAI::partition_pointer->{ "size" }->{ "extended" } = 0;
$FAI::partition_pointer->{ "number" } = $FAI::partition_logical_counter + 4;
+ if( ! defined( $FAI::partition_pointer->{ "size" }{ "preserve" } ) )
+ {
+ $FAI::partition_pointer->{ "size" }->{ "preserve" } = 0;
+ }
}
}
| /^raid[0156]/
Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-sizes
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-sizes 2006-07-22 11:07:22 UTC (rev 3608)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-sizes 2006-07-22 11:11:55 UTC (rev 3609)
@@ -141,20 +141,24 @@
}
elsif( $config =~ /^PHY_(.*)$/ )
{
+ my $extended = -1;
foreach my $part_id ( sort keys %{ $FAI::configs{ $config }{ "partitions" } } )
{
- # my $part_size = $FAI::configs{ $config }{ "partitions" }{ $part_id }{
- # "size" }
-
- print "$part_id of $config configured for a size of " .
- $FAI::configs{ $config }{ "partitions" }{ $part_id }{ "size" }{ "range" }. "\n";
+ if( $FAI::configs{ $config }{ "partitions" }{ $part_id }{ "size" }{ "extended" } == 1 )
+ {
}
- # compute size of extended later on
- }
- else
+ elsif( $FAI::configs{ $config }{ "partitions" }{ $part_id }{ "size" }{ "preserve" } == 0 )
{
- warn "Internal error (invalid config entry $config).\n";
+ my $part_size = $FAI::configs{ $config }{ "partitions" }{ $part_id }{
+ "size" }{ "range" };
}
+ # compute size of extended later on
+ }
+ }
+ else
+ {
+ warn "Internal error (invalid config entry $config).\n";
+ }
}
1;
More information about the Fai-commit
mailing list