summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-04-13 10:25:31 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-14 10:58:33 +0100
commitf7352ca2c483ef695c7276296d1f08b3ff4c1d2e (patch)
tree0bef2991be7cb6730c9b11bcf917fecc48236b86 /scripts/lib
parentb2f5de58fccc7be9260abd68965d4c973ec1a18b (diff)
downloadpoky-f7352ca2c483ef695c7276296d1f08b3ff4c1d2e.tar.gz
wic: fix bug in handling fsoptions
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>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/wic/utils/partitionedfs.py36
1 files changed, 17 insertions, 19 deletions
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 5a103bbc7e..ad596d26f2 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -96,25 +96,23 @@ class Image(object):
96 # Converting kB to sectors for parted 96 # Converting kB to sectors for parted
97 size = size * 1024 / self.sector_size 97 size = size * 1024 / self.sector_size
98 98
99 # We still need partition for "/" or non-subvolume 99 part = {'ks_pnum': ks_pnum, # Partition number in the KS file
100 if mountpoint == "/" or not fsopts: 100 'size': size, # In sectors
101 part = {'ks_pnum': ks_pnum, # Partition number in the KS file 101 'mountpoint': mountpoint, # Mount relative to chroot
102 'size': size, # In sectors 102 'source_file': source_file, # partition contents
103 'mountpoint': mountpoint, # Mount relative to chroot 103 'fstype': fstype, # Filesystem type
104 'source_file': source_file, # partition contents 104 'fsopts': fsopts, # Filesystem mount options
105 'fstype': fstype, # Filesystem type 105 'label': label, # Partition label
106 'fsopts': fsopts, # Filesystem mount options 106 'disk_name': disk_name, # physical disk name holding partition
107 'label': label, # Partition label 107 'device': None, # kpartx device node for partition
108 'disk_name': disk_name, # physical disk name holding partition 108 'num': None, # Partition number
109 'device': None, # kpartx device node for partition 109 'boot': boot, # Bootable flag
110 'num': None, # Partition number 110 'align': align, # Partition alignment
111 'boot': boot, # Bootable flag 111 'no_table' : no_table, # Partition does not appear in partition table
112 'align': align, # Partition alignment 112 'part_type' : part_type, # Partition type
113 'no_table' : no_table, # Partition does not appear in partition table 113 'uuid': uuid} # Partition UUID
114 'part_type' : part_type, # Partition type 114
115 'uuid': uuid} # Partition UUID 115 self.__add_partition(part)
116
117 self.__add_partition(part)
118 116
119 def layout_partitions(self, ptable_format="msdos"): 117 def layout_partitions(self, ptable_format="msdos"):
120 """ Layout the partitions, meaning calculate the position of every 118 """ Layout the partitions, meaning calculate the position of every