summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/ksparser.py4
-rw-r--r--scripts/lib/wic/partition.py8
-rw-r--r--scripts/lib/wic/plugins/imager/direct.py2
3 files changed, 5 insertions, 9 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')
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 647a6fb3a7..f0e88fb4e8 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -136,11 +136,11 @@ class Partition():
136 "specify a non-zero --size/--fixed-size for that " 136 "specify a non-zero --size/--fixed-size for that "
137 "partition." % self.mountpoint) 137 "partition." % self.mountpoint)
138 138
139 if self.fstype and self.fstype == "swap": 139 if self.fstype == "swap":
140 self.prepare_swap_partition(cr_workdir, oe_builddir, 140 self.prepare_swap_partition(cr_workdir, oe_builddir,
141 native_sysroot) 141 native_sysroot)
142 self.source_file = "%s/fs.%s" % (cr_workdir, self.fstype) 142 self.source_file = "%s/fs.%s" % (cr_workdir, self.fstype)
143 elif self.fstype: 143 else:
144 rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label, 144 rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label,
145 self.lineno, self.fstype) 145 self.lineno, self.fstype)
146 if os.path.isfile(rootfs): 146 if os.path.isfile(rootfs):
@@ -217,10 +217,6 @@ class Partition():
217 if os.path.isfile(rootfs): 217 if os.path.isfile(rootfs):
218 os.remove(rootfs) 218 os.remove(rootfs)
219 219
220 if not self.fstype:
221 raise WicError("File system for partition %s not specified in "
222 "kickstart, use --fstype option" % self.mountpoint)
223
224 # Get rootfs size from bitbake variable if it's not set in .ks file 220 # Get rootfs size from bitbake variable if it's not set in .ks file
225 if not self.size: 221 if not self.size:
226 # Bitbake variable ROOTFS_SIZE is calculated in 222 # Bitbake variable ROOTFS_SIZE is calculated in
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 67fd183670..79b948a739 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -487,8 +487,6 @@ class PartitionedImage():
487 parted_fs_type = "fat32" 487 parted_fs_type = "fat32"
488 elif part.fstype == "msdos": 488 elif part.fstype == "msdos":
489 parted_fs_type = "fat16" 489 parted_fs_type = "fat16"
490 elif part.fstype == "ontrackdm6aux3":
491 parted_fs_type = "ontrackdm6aux3"
492 else: 490 else:
493 # Type for ext2/ext3/ext4/btrfs 491 # Type for ext2/ext3/ext4/btrfs
494 parted_fs_type = "ext2" 492 parted_fs_type = "ext2"