[Fai-commit] r6448 - branches/stable/3.4/lib/setup-storage

[Michael Prokop]

Author: mika
Date: 2011-04-15 18:15:51 +0000 (Fri, 15 Apr 2011)
New Revision: 6448

Modified:
   branches/stable/3.4/lib/setup-storage/Parser.pm
Log:
setup-storage/Parser.pm: Support k and K for kilobytes

(cherry picked from commit 6fceb8cac671d142e38d3e22849feec8173ac435)

Modified: branches/stable/3.4/lib/setup-storage/Parser.pm
===================================================================
--- branches/stable/3.4/lib/setup-storage/Parser.pm	2011-04-15 18:15:39 UTC (rev 6447)
+++ branches/stable/3.4/lib/setup-storage/Parser.pm	2011-04-15 18:15:51 UTC (rev 6448)
@@ -774,7 +774,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;
@@ -805,7 +805,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";
@@ -826,7 +826,7 @@
         }
         | <error: invalid partition size near "$text">
 
-    tmpfs_size: /^(RAM:(\d+%)|\d+[kMGTPiB]*)\s+/
+    tmpfs_size: /^(RAM:(\d+%)|\d+[kKMGTPiB]*)\s+/
         {
           my $size;