diff options
Diffstat (limited to 'scripts/lib/wic/ksparser.py')
-rw-r--r-- | scripts/lib/wic/ksparser.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 3453d9cb9d..913e3283dc 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py | |||
@@ -51,11 +51,11 @@ class KickStartParser(ArgumentParser): | |||
51 | def error(self, message): | 51 | def error(self, message): |
52 | raise ArgumentError(None, message) | 52 | raise ArgumentError(None, message) |
53 | 53 | ||
54 | def sizetype(default): | 54 | def sizetype(default, size_in_bytes=False): |
55 | def f(arg): | 55 | def f(arg): |
56 | """ | 56 | """ |
57 | Custom type for ArgumentParser | 57 | Custom type for ArgumentParser |
58 | Converts size string in <num>[K|k|M|G] format into the integer value | 58 | Converts size string in <num>[S|s|K|k|M|G] format into the integer value |
59 | """ | 59 | """ |
60 | try: | 60 | try: |
61 | suffix = default | 61 | suffix = default |
@@ -67,12 +67,20 @@ def sizetype(default): | |||
67 | except ValueError: | 67 | except ValueError: |
68 | raise ArgumentTypeError("Invalid size: %r" % arg) | 68 | raise ArgumentTypeError("Invalid size: %r" % arg) |
69 | 69 | ||
70 | |||
71 | if size_in_bytes: | ||
72 | if suffix == 's' or suffix == 'S': | ||
73 | return size * 512 | ||
74 | mult = 1024 | ||
75 | else: | ||
76 | mult = 1 | ||
77 | |||
70 | if suffix == "k" or suffix == "K": | 78 | if suffix == "k" or suffix == "K": |
71 | return size | 79 | return size * mult |
72 | if suffix == "M": | 80 | if suffix == "M": |
73 | return size * 1024 | 81 | return size * mult * 1024 |
74 | if suffix == "G": | 82 | if suffix == "G": |
75 | return size * 1024 * 1024 | 83 | return size * mult * 1024 * 1024 |
76 | 84 | ||
77 | raise ArgumentTypeError("Invalid size: %r" % arg) | 85 | raise ArgumentTypeError("Invalid size: %r" % arg) |
78 | return f | 86 | return f |
@@ -141,7 +149,7 @@ class KickStart(): | |||
141 | part.add_argument('mountpoint', nargs='?') | 149 | part.add_argument('mountpoint', nargs='?') |
142 | part.add_argument('--active', action='store_true') | 150 | part.add_argument('--active', action='store_true') |
143 | part.add_argument('--align', type=int) | 151 | part.add_argument('--align', type=int) |
144 | part.add_argument('--offset', type=sizetype("K")) | 152 | part.add_argument('--offset', type=sizetype("K", True)) |
145 | part.add_argument('--exclude-path', nargs='+') | 153 | part.add_argument('--exclude-path', nargs='+') |
146 | part.add_argument('--include-path', nargs='+', action='append') | 154 | part.add_argument('--include-path', nargs='+', action='append') |
147 | part.add_argument('--change-directory') | 155 | part.add_argument('--change-directory') |