diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-03-30 13:37:15 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-01 08:14:57 +0100 |
commit | 54cd064c669b42d498a5f47a1e4f79d17b3fe3ba (patch) | |
tree | 0edb825f60b3f9142441aac43eaf95a04419a488 /scripts/lib/wic/ksparser.py | |
parent | 09548406e156f1b120a82dd13464d29306c63606 (diff) | |
download | poky-54cd064c669b42d498a5f47a1e4f79d17b3fe3ba.tar.gz |
wic: allow only supported fstypes
Restricted possible values of --fstype to the list of
supported types. This should catch incorrect values
when .wks file is being parsed.
Removed checks for empty fstype and mentioning of
unsupported fstype 'ontrackdm6aux3'.
(From OE-Core rev: 21af89a6d44ccea6aef975ffd2483a8fad1231de)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/ksparser.py')
-rw-r--r-- | scripts/lib/wic/ksparser.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index a0393008eb..d026caad0f 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py | |||
@@ -136,7 +136,9 @@ class KickStart(): | |||
136 | part.add_argument('--exclude-path', nargs='+') | 136 | part.add_argument('--exclude-path', nargs='+') |
137 | part.add_argument("--extra-space", type=sizetype) | 137 | part.add_argument("--extra-space", type=sizetype) |
138 | part.add_argument('--fsoptions', dest='fsopts') | 138 | part.add_argument('--fsoptions', dest='fsopts') |
139 | part.add_argument('--fstype') | 139 | part.add_argument('--fstype', default='vfat', |
140 | choices=('ext2', 'ext3', 'ext4', 'btrfs', | ||
141 | 'squashfs', 'vfat', 'msdos', 'swap')) | ||
140 | part.add_argument('--label') | 142 | part.add_argument('--label') |
141 | part.add_argument('--no-table', action='store_true') | 143 | part.add_argument('--no-table', action='store_true') |
142 | part.add_argument('--ondisk', '--ondrive', dest='disk', default='sda') | 144 | part.add_argument('--ondisk', '--ondrive', dest='disk', default='sda') |