[Fai-commit] r6419 - trunk/lib/setup-storage
Michael Tautschnig
mt at alioth.debian.org
Fri Apr 15 15:37:06 UTC 2011
Author: mt
Date: 2011-04-15 15:37:03 +0000 (Fri, 15 Apr 2011)
New Revision: 6419
Modified:
trunk/lib/setup-storage/Parser.pm
Log:
setup-storage/Parser.pm: Support k and K for kilobytes
Modified: trunk/lib/setup-storage/Parser.pm
===================================================================
--- trunk/lib/setup-storage/Parser.pm 2011-04-15 15:21:35 UTC (rev 6418)
+++ trunk/lib/setup-storage/Parser.pm 2011-04-15 15:37:03 UTC (rev 6419)
@@ -857,7 +857,7 @@
1;
}
- size: /^((RAM:\d+%|\d+[kMGTP%iB]*)(-(RAM:\d+%|\d+[kMGTP%iB]*)?)?)(:resize)?/
+ size: /^((RAM:\d+%|\d+[kKMGTP%iB]*)(-(RAM:\d+%|\d+[kKMGTP%iB]*)?)?)(:resize)?/
{
# complete the size specification to be a range in all cases
my $range = $1;
@@ -888,7 +888,7 @@
$FAI::configs{$FAI::device}{preserveparts} = 1;
}
}
- | /^(-(RAM:\d+%|\d+[kMGTP%iB]*))(:resize)?\s+/
+ | /^(-(RAM:\d+%|\d+[kKMGTP%iB]*))(:resize)?\s+/
{
# complete the range by assuming 0 as the lower limit
my $range = "0$1";
@@ -909,7 +909,7 @@
}
| <error: invalid partition size near "$text">
- tmpfs_size: /^(RAM:(\d+%)|\d+[kMGTPiB]*)\s+/
+ tmpfs_size: /^(RAM:(\d+%)|\d+[kKMGTPiB]*)\s+/
{
my $size;
More information about the Fai-commit
mailing list