diff options
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/wic/ksparser.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/source/rawcopy.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index a49b7b97c4..d1e546b12d 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py | |||
| @@ -159,7 +159,7 @@ class KickStart(): | |||
| 159 | part.add_argument('--fstype', default='vfat', | 159 | part.add_argument('--fstype', default='vfat', |
| 160 | choices=('ext2', 'ext3', 'ext4', 'btrfs', | 160 | choices=('ext2', 'ext3', 'ext4', 'btrfs', |
| 161 | 'squashfs', 'vfat', 'msdos', 'erofs', | 161 | 'squashfs', 'vfat', 'msdos', 'erofs', |
| 162 | 'swap')) | 162 | 'swap', 'none')) |
| 163 | part.add_argument('--mkfs-extraopts', default='') | 163 | part.add_argument('--mkfs-extraopts', default='') |
| 164 | part.add_argument('--label') | 164 | part.add_argument('--label') |
| 165 | part.add_argument('--use-label', action='store_true') | 165 | part.add_argument('--use-label', action='store_true') |
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index 8101efcb28..ccf332554e 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py | |||
| @@ -25,6 +25,10 @@ class RawCopyPlugin(SourcePlugin): | |||
| 25 | 25 | ||
| 26 | @staticmethod | 26 | @staticmethod |
| 27 | def do_image_label(fstype, dst, label): | 27 | def do_image_label(fstype, dst, label): |
| 28 | # don't create label when fstype is none | ||
| 29 | if fstype == 'none': | ||
| 30 | return | ||
| 31 | |||
| 28 | if fstype.startswith('ext'): | 32 | if fstype.startswith('ext'): |
| 29 | cmd = 'tune2fs -L %s %s' % (label, dst) | 33 | cmd = 'tune2fs -L %s %s' % (label, dst) |
| 30 | elif fstype in ('msdos', 'vfat'): | 34 | elif fstype in ('msdos', 'vfat'): |
