Partitions: Fix check for additional partitions on single part.

This commit is contained in:
Anders Ingemann 2017-08-20 10:36:05 +02:00
parent 8932f223b8
commit 19e15d15bf
No known key found for this signature in database
GPG key ID: 49C87973A14931A9

View file

@ -108,9 +108,10 @@ class MountAdditional(Task):
def run(cls, info): def run(cls, info):
import os import os
from bootstrapvz.base.fs.partitions.unformatted import UnformattedPartition from bootstrapvz.base.fs.partitions.unformatted import UnformattedPartition
from bootstrapvz.base.fs.partitions.single import SinglePartition
def is_additional(partition): def is_additional(partition):
return (not isinstance(partition, UnformattedPartition) and return (not isinstance(partition, (UnformattedPartition, SinglePartition)) and
partition.name not in ["boot", "swap", "root"]) partition.name not in ["boot", "swap", "root"])
p_map = info.volume.partition_map p_map = info.volume.partition_map
@ -193,9 +194,10 @@ class FStab(Task):
def run(cls, info): def run(cls, info):
import os.path import os.path
from bootstrapvz.base.fs.partitions.unformatted import UnformattedPartition from bootstrapvz.base.fs.partitions.unformatted import UnformattedPartition
from bootstrapvz.base.fs.partitions.single import SinglePartition
def is_additional(partition): def is_additional(partition):
return (not isinstance(partition, UnformattedPartition) and return (not isinstance(partition, (UnformattedPartition, SinglePartition)) and
partition.name not in ["boot", "swap", "root"]) partition.name not in ["boot", "swap", "root"])
p_map = info.volume.partition_map p_map = info.volume.partition_map