mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

wic: fix bug in handling fsoptions

Browse Source 
Partitions specifying --fsoptions were silently skipped by wic
due to the old bug introduced when removing code related to
subvolume handling:

- if mountpoint == "/" or not fsopts or fsopts.find("subvol=") == -1
+ if mountpoint == "/" or not fsopts:

[YOCTO #9396]

(From OE-Core rev: be7ff1741e8ab5f2724b3f64da1bed8b0d3dcb7c)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2016-04-13 10:25:31 +03:00
committed by Richard Purdie
parent b2f5de58fc
commit f7352ca2c4
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/wic/utils/partitionedfs.py
+16 -18
View File
@@ -96,25 +96,23 @@ class Image(object):
# Converting kB to sectors for parted # Converting kB to sectors for parted
size = size * 1024 / self.sector_size size = size * 1024 / self.sector_size
# We still need partition for "/" or non-subvolume part = {'ks_pnum': ks_pnum, # Partition number in the KS file
if mountpoint == "/" or not fsopts: 'size': size, # In sectors
part = {'ks_pnum': ks_pnum, # Partition number in the KS file 'mountpoint': mountpoint, # Mount relative to chroot
'size': size, # In sectors 'source_file': source_file, # partition contents
'mountpoint': mountpoint, # Mount relative to chroot 'fstype': fstype, # Filesystem type
'source_file': source_file, # partition contents 'fsopts': fsopts, # Filesystem mount options
'fstype': fstype, # Filesystem type 'label': label, # Partition label
'fsopts': fsopts, # Filesystem mount options 'disk_name': disk_name, # physical disk name holding partition
'label': label, # Partition label 'device': None, # kpartx device node for partition
'disk_name': disk_name, # physical disk name holding partition 'num': None, # Partition number
'device': None, # kpartx device node for partition 'boot': boot, # Bootable flag
'num': None, # Partition number 'align': align, # Partition alignment
'boot': boot, # Bootable flag 'no_table' : no_table, # Partition does not appear in partition table
'align': align, # Partition alignment 'part_type' : part_type, # Partition type
'no_table' : no_table, # Partition does not appear in partition table 'uuid': uuid} # Partition UUID
'part_type' : part_type, # Partition type
'uuid': uuid} # Partition UUID
self.__add_partition(part) self.__add_partition(part)
def layout_partitions(self, ptable_format="msdos"): def layout_partitions(self, ptable_format="msdos"):
""" Layout the partitions, meaning calculate the position of every """ Layout the partitions, meaning calculate the position of every