From 7f9ecc51efd9c5d7d2bd6006acef55a2751b3b7f Mon Sep 17 00:00:00 2001
From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Thu, 3 Jan 2013 19:51:08 +0200
Subject: [PATCH] Fix a bug in image shrinking code pt2
Handle correct extended partitions with id 0xf
---
image_creator/disk.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/image_creator/disk.py b/image_creator/disk.py
index 8582428..0f0c0f7 100644
--- a/image_creator/disk.py
+++ b/image_creator/disk.py
@@ -279,16 +279,17 @@ class DiskDevice(object):
raise FatalError(msg)
is_extended = lambda p: \
- self.g.part_get_mbr_id(self.guestfs_device, p['part_num']) == 5
+ self.g.part_get_mbr_id(self.guestfs_device, p['part_num']) \
+ in (0x5, 0xf)
is_logical = lambda p: \
- self.meta['PARTITION_TABLE'] != 'msdos' and p['part_num'] > 4
+ self.meta['PARTITION_TABLE'] == 'msdos' and p['part_num'] > 4
partitions = self.g.part_list(self.guestfs_device)
last_partition = partitions[-1]
if is_logical(last_partition):
# The disk contains extended and logical partitions....
- extended = [p for p in partitions if is_extended(p)][0]
+ extended = filter(is_extended, partitions)[0]
last_primary = [p for p in partitions if p['part_num'] <= 4][-1]
# check if extended is the last primary partition
@@ -312,7 +313,8 @@ class DiskDevice(object):
self.meta['PARTITION_TABLE'] == 'msdos' and p['part_num'] > 4
is_extended = lambda p: \
self.meta['PARTITION_TABLE'] == 'msdos' and \
- self.g.part_get_mbr_id(self.guestfs_device, p['part_num']) == 5
+ self.g.part_get_mbr_id(self.guestfs_device, p['part_num']) \
+ in (0x5, 0xf)
part_add = lambda ptype, start, stop: \
self.g.part_add(self.guestfs_device, ptype, start, stop)
@@ -362,10 +364,8 @@ class DiskDevice(object):
self.g.resize2fs_M(part_dev)
out = self.g.tune2fs_l(part_dev)
- block_size = int(
- filter(lambda x: x[0] == 'Block size', out)[0][1])
- block_cnt = int(
- filter(lambda x: x[0] == 'Block count', out)[0][1])
+ block_size = int(filter(lambda x: x[0] == 'Block size', out)[0][1])
+ block_cnt = int(filter(lambda x: x[0] == 'Block count', out)[0][1])
start = last_part['part_start'] / sector_size
end = start + (block_size * block_cnt) / sector_size - 1
@@ -388,7 +388,7 @@ class DiskDevice(object):
logical[-1]['end'] = end # new end after resize
# Recreate the extended partition
- extended = [p for p in partitions if self._is_extended(p)][0]
+ extended = filter(is_extended, partitions)[0]
part_del(extended['part_num'])
part_add('e', extended['part_start'] / sector_size, end)
--
GitLab