From e20c7f9391723b5dde5023f99c52938a77720c2e Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sun, 19 Jan 2014 13:00:26 +0100 Subject: [PATCH] The grub partition for GPT only needs 1007KiB --- base/fs/partitionmaps/gpt.py | 2 +- base/fs/partitionmaps/msdos.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/base/fs/partitionmaps/gpt.py b/base/fs/partitionmaps/gpt.py index 6187a6f..a798cb4 100644 --- a/base/fs/partitionmaps/gpt.py +++ b/base/fs/partitionmaps/gpt.py @@ -17,7 +17,7 @@ class GPTPartitionMap(AbstractPartitionMap): if bootloader == 'grub': from ..partitions.unformatted import UnformattedPartition - self.grub_boot = UnformattedPartition(Bytes('2MiB'), last_partition()) + self.grub_boot = UnformattedPartition(Bytes('1007KiB'), last_partition()) self.grub_boot.flags.append('bios_grub') self.partitions.append(self.grub_boot) diff --git a/base/fs/partitionmaps/msdos.py b/base/fs/partitionmaps/msdos.py index 138d630..ab71978 100644 --- a/base/fs/partitionmaps/msdos.py +++ b/base/fs/partitionmaps/msdos.py @@ -13,8 +13,6 @@ class MSDOSPartitionMap(AbstractPartitionMap): def last_partition(): return self.partitions[-1] if len(self.partitions) > 0 else None - grub_offset = Bytes('2MiB') - if 'boot' in data: self.boot = MSDOSPartition(Bytes(data['boot']['size']), data['boot']['filesystem'], None) self.partitions.append(self.boot) @@ -27,7 +25,7 @@ class MSDOSPartitionMap(AbstractPartitionMap): getattr(self, 'boot', self.root).flags.append('boot') if bootloader == 'grub': - self.partitions[0].offset = grub_offset + self.partitions[0].offset = Bytes('2MiB') self.partitions[0].size -= self.partitions[0].offset super(MSDOSPartitionMap, self).__init__(bootloader)