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

Merge pull request #904 from mwhudson/lp-1905412 

do not try to reuse a name of an existing vg in guided_lvm
This commit is contained in:
Michael Hudson-Doyle 2021-03-10 09:11:31 +13:00 committed by GitHub
parent 3427ccf579 41e42e0f39
commit 6d091b054a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
subiquity/common/filesystem.py
View File

@ -398,7 +398,12 @@ class FilesystemManipulator:
size=disk.free_for_partitions,
fstype=None,
))
spec = dict(name="ubuntu-vg", devices=set([part]))
vg_name = 'ubuntu-vg'
i = 0
while self.model._one(type='lvm_volgroup', name=vg_name) is not None:
i += 1
vg_name = 'ubuntu-vg-{}'.format(i)
spec = dict(name=vg_name, devices=set([part]))
if lvm_options and lvm_options['encrypt']:
spec['password'] = lvm_options['luks_options']['password']
vg = self.create_volgroup(spec)

19
subiquity/ui/views/filesystem/lvm.py
View File

@ -77,8 +77,10 @@ VGNameField = simple_field(VGNameEditor)
class VolGroupForm(CompoundDiskForm):
def __init__(self, model, possible_components, initial, vg_names):
def __init__(self, model, possible_components, initial,
vg_names, deleted_vg_names):
self.vg_names = vg_names
self.deleted_vg_names = deleted_vg_names
super().__init__(model, possible_components, initial)
connect_signal(self.encrypt.widget, 'change', self._change_encrypt)
setup_password_validation(self, _("passphrases"))
@ -109,12 +111,13 @@ class VolGroupForm(CompoundDiskForm):
return _("The name of a volume group cannot be empty")
if v.startswith('-'):
return _("The name of a volume group cannot start with a hyphen")
if v in ('.', '..', 'md') or os.path.exists('/dev/' + v):
return _("{name} is not a valid name for a volume group").format(
name=v)
if v in self.vg_names:
return _("There is already a volume group named '{name}'").format(
name=self.name.value)
if v in ('.', '..', 'md') or os.path.exists('/dev/' + v):
if v not in self.deleted_vg_names:
return _("{name} is not a valid name for a volume "
"group").format(name=v)
def validate_password(self):
if self.encrypt.value and len(self.password.value) < 1:
@ -131,6 +134,10 @@ class VolGroupStretchy(Stretchy):
self.parent = parent
self.existing = existing
vg_names = {vg.name for vg in parent.model.all_volgroups()}
orig_vg_names = {
action['name'] for action in parent.model._orig_config
if action['type'] == 'lvm_volgroup'
}
if existing is None:
title = _('Create LVM volume group')
label = _('Create')
@ -168,8 +175,10 @@ class VolGroupStretchy(Stretchy):
self.parent.model, existing, initial['devices'],
lambda dev: dev.ok_for_lvm_vg)
deleted_vg_names = orig_vg_names - vg_names
form = self.form = VolGroupForm(
self.parent.model, possible_components, initial, vg_names)
self.parent.model, possible_components, initial,
vg_names, deleted_vg_names)
self.form.buttons.base_widget[0].set_label(label)
self.form.devices.widget.set_supports_spares(False)