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

support explicit storage configs for autoinstall

This commit is contained in:
Michael Hudson-Doyle 2020-03-05 08:25:45 +01:00
parent 32012389ca
commit c3b3615d6f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
subiquity/controllers/filesystem.py
View File

@ -154,6 +154,10 @@ class FilesystemController(SubiquityController):
disks = self.model.all_disks() disks = self.model.all_disks()
disks.sort(key=lambda x: x.size) disks.sort(key=lambda x: x.size)
meth(disks[-1]) meth(disks[-1])
elif 'config' in self.ai_data:
with self.context.child("applying_autoinstall"):
# needs to account for grub and swap data too.
self.model.apply_autoinstall_config(self.ai_data['config'])
def start(self): def start(self):
self._start_task = schedule_task(self._start()) self._start_task = schedule_task(self._start())

4
subiquity/models/filesystem.py
View File

@ -1257,6 +1257,10 @@ class FilesystemModel(object):
self._actions = [] self._actions = []
self.grub_install_device = None self.grub_install_device = None
def apply_autoinstall_config(self, ai_config):
self._actions = self._actions_from_config(
ai_config, self._probe_data['blockdev'])
def _actions_from_config(self, config, blockdevs): def _actions_from_config(self, config, blockdevs):
"""Convert curtin storage config into action instances. """Convert curtin storage config into action instances.