[Fai-commit] r6273 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2011-01-19 23:20:05 +0000 (Wed, 19 Jan 2011)
New Revision: 6273

Modified:
   branches/experimental/patches/bugfix-498412
   branches/experimental/patches/setup-storage_no-cylinder-boundaries
   branches/experimental/patches/setup-storage_preserve-format-all
Log:
accept k and K for K(iB)


Modified: branches/experimental/patches/bugfix-498412
===================================================================
--- branches/experimental/patches/bugfix-498412	2011-01-19 19:17:43 UTC (rev 6272)
+++ branches/experimental/patches/bugfix-498412	2011-01-19 23:20:05 UTC (rev 6273)
@@ -15,7 +15,7 @@
  
  # for syntax checks
  BASH_SCRIPTS = lib/fai-divert lib/fai-mount-disk lib/fai-savelog lib/fai-vol_id lib/get-boot-info lib/get-config-dir lib/get-config-dir-cvs lib/get-config-dir-file lib/get-config-dir-git lib/get-config-dir-hg lib/get-config-dir-nfs lib/get-config-dir-svn lib/mkramdisk lib/mount2dir lib/prcopyleft lib/subroutines lib/task_sysinfo lib/updatebase
-@@ -70,6 +70,7 @@
+@@ -75,6 +75,7 @@
  	mkdir -p $(DESTDIR)/etc/{init,init.d} $(DESTDIR)/usr/share/fai/{pixmaps/small,setup-storage}
  	install man/* $(DESTDIR)/man
  	pod2man -c '' -r '' -s8 bin/dhcp-edit > $(DESTDIR)/man/dhcp-edit.8

Modified: branches/experimental/patches/setup-storage_no-cylinder-boundaries
===================================================================
--- branches/experimental/patches/setup-storage_no-cylinder-boundaries	2011-01-19 19:17:43 UTC (rev 6272)
+++ branches/experimental/patches/setup-storage_no-cylinder-boundaries	2011-01-19 23:20:05 UTC (rev 6273)
@@ -131,13 +131,40 @@
          {
            $FAI::configs{$FAI::device}{partitions}{$_}{size}{always_format} = 1 foreach (split(",", $1));
          }
-+        | /^align-at:(\d+[kMGTPiB]*)/
++        | /^align-at:(\d+[kKMGTPiB]*)/
 +        {
 +          $FAI::configs{$FAI::device}{align_at} = &FAI::convert_unit($1) * 1024.0 * 1024.0;
 +        }
  
      volume: /^vg\s+/ name devices vgcreateopt(s?)
          | /^raid([0156]|10)\s+/
+@@ -739,7 +743,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;
+@@ -770,7 +774,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";
+@@ -791,7 +795,7 @@
+         }
+         | <error: invalid partition size near "$text">
+ 
+-    tmpfs_size: /^(RAM:(\d+%)|\d+[kMGTPiB]*)\s+/
++    tmpfs_size: /^(RAM:(\d+%)|\d+[kKMGTPiB]*)\s+/
+         {
+           my $size;
+ 
 Index: trunk/man/setup-storage.8
 ===================================================================
 --- trunk.orig/man/setup-storage.8
@@ -146,7 +173,7 @@
  .br
             */
  .br
-+           | align-at:([[:digit:]]+[kMGTPiB]*)
++           | align-at:([[:digit:]]+[kKMGTPiB]*)
 +.br
 +           /* Align partitions at multiples of the given block size (unit
 +.br

Modified: branches/experimental/patches/setup-storage_preserve-format-all
===================================================================
--- branches/experimental/patches/setup-storage_preserve-format-all	2011-01-19 19:17:43 UTC (rev 6272)
+++ branches/experimental/patches/setup-storage_preserve-format-all	2011-01-19 23:20:05 UTC (rev 6273)
@@ -308,7 +308,7 @@
 +            $FAI::configs{$FAI::device}{partitions}{$_}{size}{always_format} = 1 foreach (split(",", $1));
 +          }
          }
-         | /^align-at:(\d+[kMGTPiB]*)/
+         | /^align-at:(\d+[kKMGTPiB]*)/
          {
 @@ -613,12 +682,14 @@
            $FAI::configs{RAID}{volumes}{$vol_id}{mode} = $1;