From d5687e8976567b2d2c7714cbaf06e76be0a44e3e Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Thu, 10 Jan 2008 11:41:22 +0000
Subject: [PATCH] Fix gnt-backup import -s option
Update gnt-backup import to be in line with gnt-instance add about the os disk
size option. Thanks to Gunnar Wagenknecht for spotting the issue.
Reviewed-by: imsnah
---
man/gnt-backup.sgml | 7 ++++++-
scripts/gnt-backup | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/man/gnt-backup.sgml b/man/gnt-backup.sgml
index 25f367388..796148d53 100644
--- a/man/gnt-backup.sgml
+++ b/man/gnt-backup.sgml
@@ -122,7 +122,12 @@
<para>
The <option>-s</option> option specifies the disk size for
- the instance, in gibibytes (defaults to 20 GiB).
+ the instance, in mebibytes (defaults to
+ <constant>20480MiB</constant> =
+ <constant>20GiB</constant>). You can also use one of the
+ suffixes <literal>m</literal>, <literal>g</literal> or
+ <literal>t</literal> to specificy the exact the units used;
+ these suffixes map to mebibytes, gibibytes and tebibytes.
</para>
<para>
diff --git a/scripts/gnt-backup b/scripts/gnt-backup
index daf7c90dd..6ad2e703d 100755
--- a/scripts/gnt-backup
+++ b/scripts/gnt-backup
@@ -106,7 +106,8 @@ import_opts = [
make_option("-n", "--node", dest="node",
help="Target node and optional secondary node",
metavar="<pnode>[:<snode>]"),
- cli_option("-s", "--os-size", dest="size", help="Disk size",
+ cli_option("-s", "--os-size", dest="size", help="Disk size, in MiB unless"
+ " a suffix is used",
default=20 * 1024, type="unit", metavar="<size>"),
cli_option("--swap-size", dest="swap", help="Swap size",
default=4 * 1024, type="unit", metavar="<size>"),
--
GitLab