diff options
| author |   Anuj Mittal <anuj.mittal@intel.com> | 2018-07-12 10:05:25 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-18 10:09:29 +0100 |
| commit | a88f1b5d88dbc5fb28be24b9787d73b9e0cdf183 (patch) | |
| tree | 8c629b55e1512958d8f943f4b5df32c78cb595e1 /scripts | |
| parent | 5eef63f5afdfbab8e30748cb1bf42bf2e6524759 (diff) | |
| download | openembedded-core-contrib-a88f1b5d88dbc5fb28be24b9787d73b9e0cdf183.tar.gz | |
wic/engine: use up all free space when expanding partitions
Currently we just divide up the free space by the number of partitions
that need to be re-sized. This leads to problems when a user has
explicitly specified a subset of partitions (but not all) that need
to re-sized along with the sizes. As an example, for an image with 3
partitions, if we use:
wic write image.wic /dev/sdb --expand 1:10G
This would lead to paritions 2 and 3 each being re-sized to one thirds
of the free space instead of half.
Change the behavior to use up all the free space.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/wic/engine.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index fe036f60e97..f0c5ff0aafe 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -416,6 +416,7 @@ class Disk: # calculate expanded partitions sizes sizes = {} + num_auto_resize = 0 for num, part in enumerate(parts['partitiontable']['partitions'], 1): if num in expand: if expand[num] != 0: # don't resize partition if size is set to 0 @@ -425,10 +426,11 @@ class Disk: sizes[num] = sectors elif part['type'] != 'f': sizes[num] = -1 + num_auto_resize += 1 for num, part in enumerate(parts['partitiontable']['partitions'], 1): if sizes.get(num) == -1: - part['size'] += free // len(sizes) + part['size'] += free // num_auto_resize # write resized partition table to the target write_ptable(parts, target) |