StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #704 from mwhudson/clear-confusion 

set wipe, preserve more consistently
This commit is contained in:
Michael Hudson-Doyle 2020-04-14 14:41:03 +12:00 committed by GitHub
parent c0b7daa984 33cd2c356a
commit bca97f424d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
subiquity/controllers/filesystem.py
View File

@ -465,7 +465,7 @@ class FilesystemController(SubiquityController):
return part
def create_raid(self, spec):
for d in spec['devices']:
for d in spec['devices'] | spec['spare_devices']:
self.clear(d)
raid = self.model.add_raid(
spec['name'],
@ -522,16 +522,16 @@ class FilesystemController(SubiquityController):
getattr(self, 'delete_' + obj.type)(obj)
def clear(self, obj):
if obj.type == "disk":
obj.preserve = False
obj.wipe = 'superblock'
for subobj in obj.fs(), obj.constructed_device():
self.delete(subobj)
def reformat(self, disk):
if disk.type == "disk":
disk.preserve = False
disk.wipe = 'superblock-recursive'
self.clear(disk)
for p in list(disk.partitions()):
self.delete(p)
self.delete_partition(p)
self.clear(disk)
def partition_disk_handler(self, disk, partition, spec):
log.debug('partition_disk_handler: %s %s %s', disk, partition, spec)