From 1569797e5b69f471bbcadd58929e064772e5709e Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Mon, 19 Jan 2015 01:20:43 +0100 Subject: [PATCH] Properly set the states of different partitions in prebootstrapped plugin --- bootstrapvz/plugins/prebootstrapped/tasks.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/bootstrapvz/plugins/prebootstrapped/tasks.py b/bootstrapvz/plugins/prebootstrapped/tasks.py index 7937b30..b1074c2 100644 --- a/bootstrapvz/plugins/prebootstrapped/tasks.py +++ b/bootstrapvz/plugins/prebootstrapped/tasks.py @@ -80,12 +80,20 @@ def set_fs_states(volume): volume.fsm.current = 'detached' p_map = volume.partition_map - partitions_state = 'attached' from bootstrapvz.base.fs.partitionmaps.none import NoPartitions - if isinstance(p_map, NoPartitions): - partitions_state = 'formatted' - else: + if not isinstance(p_map, NoPartitions): p_map.fsm.current = 'unmapped' - partitions_state = 'unmapped_fmt' + + from bootstrapvz.base.fs.partitions.gap import PartitionGap + from bootstrapvz.base.fs.partitions.unformatted import UnformattedPartition + from bootstrapvz.base.fs.partitions.single import SinglePartition for partition in p_map.partitions: - partition.fsm.current = partitions_state + if isinstance(partition, PartitionGap): + continue + if isinstance(partition, UnformattedPartition): + partition.fsm.current = 'unmapped' + continue + if isinstance(partition, SinglePartition): + partition.fsm.current = 'formatted' + continue + partition.fsm.current = 'unmapped_fmt'