From 0fdcc2e27b744fae4c5b8ad7df10e3229e96ca29 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sun, 27 Oct 2013 08:52:26 +0100 Subject: [PATCH] Fix bug when no boot partition is specified --- base/fs/partitionmaps/gpt.py | 3 ++- base/fs/partitionmaps/mbr.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/base/fs/partitionmaps/gpt.py b/base/fs/partitionmaps/gpt.py index 0b2e8bf..7a95943 100644 --- a/base/fs/partitionmaps/gpt.py +++ b/base/fs/partitionmaps/gpt.py @@ -11,7 +11,8 @@ class GPTPartitionMap(AbstractPartitionMap): if 'boot' in data: self.boot = GPTPartition(data['boot']['size'], data['boot']['filesystem'], 'boot', None) self.partitions.append(self.boot) - self.root = GPTPartition(data['root']['size'], data['root']['filesystem'], 'root', self.boot) + self.root = GPTPartition(data['root']['size'], data['root']['filesystem'], 'root', + getattr(self, 'boot', None)) self.partitions.append(self.root) if 'swap' in data: self.swap = GPTSwapPartition(data['swap']['size'], self.root) diff --git a/base/fs/partitionmaps/mbr.py b/base/fs/partitionmaps/mbr.py index d2d8a8d..67c40cb 100644 --- a/base/fs/partitionmaps/mbr.py +++ b/base/fs/partitionmaps/mbr.py @@ -11,7 +11,8 @@ class MBRPartitionMap(AbstractPartitionMap): if 'boot' in data: self.boot = MBRPartition(data['boot']['size'], data['boot']['filesystem'], None) self.partitions.append(self.boot) - self.root = MBRPartition(data['root']['size'], data['root']['filesystem'], self.boot) + self.root = MBRPartition(data['root']['size'], data['root']['filesystem'], + getattr(self, 'boot', None)) self.partitions.append(self.root) if 'swap' in data: self.swap = MBRSwapPartition(data['swap']['size'], self.root)