diff options
Diffstat (limited to 'scripts/lib/wic/ksparser.py')
-rw-r--r-- | scripts/lib/wic/ksparser.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 3eb669da39..7ef3dc83dd 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py | |||
@@ -155,9 +155,11 @@ class KickStart(): | |||
155 | part.add_argument('--change-directory') | 155 | part.add_argument('--change-directory') |
156 | part.add_argument("--extra-space", type=sizetype("M")) | 156 | part.add_argument("--extra-space", type=sizetype("M")) |
157 | part.add_argument('--fsoptions', dest='fsopts') | 157 | part.add_argument('--fsoptions', dest='fsopts') |
158 | part.add_argument('--fspassno', dest='fspassno') | ||
158 | part.add_argument('--fstype', default='vfat', | 159 | part.add_argument('--fstype', default='vfat', |
159 | choices=('ext2', 'ext3', 'ext4', 'btrfs', | 160 | choices=('ext2', 'ext3', 'ext4', 'btrfs', |
160 | 'squashfs', 'vfat', 'msdos', 'swap')) | 161 | 'squashfs', 'vfat', 'msdos', 'erofs', |
162 | 'swap', 'none')) | ||
161 | part.add_argument('--mkfs-extraopts', default='') | 163 | part.add_argument('--mkfs-extraopts', default='') |
162 | part.add_argument('--label') | 164 | part.add_argument('--label') |
163 | part.add_argument('--use-label', action='store_true') | 165 | part.add_argument('--use-label', action='store_true') |
@@ -169,6 +171,7 @@ class KickStart(): | |||
169 | part.add_argument('--rootfs-dir') | 171 | part.add_argument('--rootfs-dir') |
170 | part.add_argument('--type', default='primary', | 172 | part.add_argument('--type', default='primary', |
171 | choices = ('primary', 'logical')) | 173 | choices = ('primary', 'logical')) |
174 | part.add_argument('--hidden', action='store_true') | ||
172 | 175 | ||
173 | # --size and --fixed-size cannot be specified together; options | 176 | # --size and --fixed-size cannot be specified together; options |
174 | # ----extra-space and --overhead-factor should also raise a parser | 177 | # ----extra-space and --overhead-factor should also raise a parser |
@@ -184,11 +187,13 @@ class KickStart(): | |||
184 | part.add_argument('--use-uuid', action='store_true') | 187 | part.add_argument('--use-uuid', action='store_true') |
185 | part.add_argument('--uuid') | 188 | part.add_argument('--uuid') |
186 | part.add_argument('--fsuuid') | 189 | part.add_argument('--fsuuid') |
190 | part.add_argument('--no-fstab-update', action='store_true') | ||
191 | part.add_argument('--mbr', action='store_true') | ||
187 | 192 | ||
188 | bootloader = subparsers.add_parser('bootloader') | 193 | bootloader = subparsers.add_parser('bootloader') |
189 | bootloader.add_argument('--append') | 194 | bootloader.add_argument('--append') |
190 | bootloader.add_argument('--configfile') | 195 | bootloader.add_argument('--configfile') |
191 | bootloader.add_argument('--ptable', choices=('msdos', 'gpt'), | 196 | bootloader.add_argument('--ptable', choices=('msdos', 'gpt', 'gpt-hybrid'), |
192 | default='msdos') | 197 | default='msdos') |
193 | bootloader.add_argument('--timeout', type=int) | 198 | bootloader.add_argument('--timeout', type=int) |
194 | bootloader.add_argument('--source') | 199 | bootloader.add_argument('--source') |
@@ -229,6 +234,10 @@ class KickStart(): | |||
229 | err = "%s:%d: SquashFS does not support LABEL" \ | 234 | err = "%s:%d: SquashFS does not support LABEL" \ |
230 | % (confpath, lineno) | 235 | % (confpath, lineno) |
231 | raise KickStartError(err) | 236 | raise KickStartError(err) |
237 | # erofs does not support filesystem labels | ||
238 | if parsed.fstype == 'erofs' and parsed.label: | ||
239 | err = "%s:%d: erofs does not support LABEL" % (confpath, lineno) | ||
240 | raise KickStartError(err) | ||
232 | if parsed.fstype == 'msdos' or parsed.fstype == 'vfat': | 241 | if parsed.fstype == 'msdos' or parsed.fstype == 'vfat': |
233 | if parsed.fsuuid: | 242 | if parsed.fsuuid: |
234 | if parsed.fsuuid.upper().startswith('0X'): | 243 | if parsed.fsuuid.upper().startswith('0X'): |