[Fai-commit] r6034 - in branches/stable/3.4: debian man

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:58:09 +0000 (Tue, 17 Aug 2010)
New Revision: 6034

Modified:
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/man/setup-storage.8
Log:
Added sizespec non-terminal to grammer for nicer formatting as suggested by Thomas


Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:58:05 UTC (rev 6033)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:58:09 UTC (rev 6034)
@@ -144,6 +144,8 @@
   * dhcp-edit, control: Updated to work with isc-dhcp-server or
     dhcp3-server, whichever is available.
   * fai-guide.txt: Updated to isc-dhcp-server.
+  * setup-storage.8: Nicer formatting of size specifications in grammar as
+    suggested by Thomas.
 
   [ Michael Prokop ]
   * subroutines, fai: make sure fai exits with the according return

Modified: branches/stable/3.4/man/setup-storage.8
===================================================================
--- branches/stable/3.4/man/setup-storage.8	2010-08-17 12:58:05 UTC (rev 6033)
+++ branches/stable/3.4/man/setup-storage.8	2010-08-17 12:58:09 UTC (rev 6034)
@@ -353,38 +353,39 @@
 .br
 
 
-size ::= (RAM:[[:digit:]]+%|[[:digit:]]+[kKMGTP%iB]*)(-(RAM:[[:digit:]]+%|[[:digit:]]+[kKMGTP%iB]*)?)?(:resize)?
+sizespec ::= RAM:[[:digit:]]+%|[[:digit:]]+[kKMGTP%iB]*
 .br
          /* size in kilo (KiB), mega (default, MiB), giga (GiB), tera (TiB),
 .br
-          * petabytes (PiB) or percentage of disk size or RAM size, possibly
-.br
-          * given as a range; physical partitions or lvm logical volumes only;
-.br
+          * petabytes (PiB) or percentage of disk size or RAM size;
+.br          
           * in future releases KB, MB, GB, ... will be treated as 1000 instead
 .br
           * of 1024 (KiB, MiB, GiB, ...) multipliers */
+
+
+size ::= <sizespec>(-(<sizespec>)?)?(:resize)?
 .br
-         | -(RAM:[[:digit:]]+%|[[:digit:]]+[kKMGTP%iB]*)(:resize)?
+         /* size, possibly given as a range; physical partitions or lvm logical
 .br
-         /* size in kilo, mega (default), giga, tera or petabytes or %,
+          * volumes only */
 .br
-          * given as upper limit; physical partitions
+         | -<sizespec>(:resize)?
 .br
-          * or lvm logical volumes only */
+         /* size given as upper limit; physical partitions or lvm logical
 .br
+          * volumes only */
+.br
          | [^,:[:space:]]+(:(spare|missing))*(,[^,:[:space:]]+(:(spare|missing))*)*
 .br
          /* devices and options for a raid or lvm vg */
 .br
 
 
-tmpfs_size ::= (RAM:[[:digit:]]+%|[[:digit:]]+[kKMGTPiB]*)
+tmpfs_size ::= <sizespec>
 .br
-         /* tmpfs size in percentage of the total RAM or fixed size in
+         /* tmpfs size */
 .br
-          kilo (KiB), mega (default, MiB), giga (GiB), tera (TiB) or petabytes (PiB).
-.br
 
 
 mount_options ::= [^[:space:]]+