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

Merge pull request #1488 from mwhudson/system-seed-null 

add a new member of the snapdapi.Role enum
This commit is contained in:
Michael Hudson-Doyle 2022-11-30 09:08:34 +13:00 committed by GitHub
parent 6bb8baee59 756fda0f91
commit 50ff026cad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
subiquity/server/controllers/filesystem.py
View File

@ -147,7 +147,7 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
self._system: Optional[snapdapi.SystemDetails] = None
self._core_boot_classic_error: str = ''
self._system_mounter: Optional[Mounter] = None
self._role_to_device: Dict[snapdapi.Role: _Device] = {}
self._role_to_device: Dict[str: _Device] = {}
self.use_tpm: bool = False
def is_core_boot_classic(self):
@ -555,7 +555,6 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
on_volumes=self._on_volumes()))
role_to_encrypted_device = result['encrypted-devices']
for role, enc_path in role_to_encrypted_device.items():
role = snapdapi.Role(role)
arb_device = ArbitraryDevice(m=self.model, path=enc_path)
self.model._actions.append(arb_device)
part = self._role_to_device[role]

5
subiquity/server/snapdapi.py
View File

@ -91,7 +91,7 @@ class Response:
status: str
class Role(enum.Enum):
class Role:
NONE = ''
MBR = 'mbr'
@ -102,6 +102,7 @@ class Role(enum.Enum):
SYSTEM_RECOVERY_SELECT = 'system-recovery-select'
SYSTEM_SAVE = 'system-save'
SYSTEM_SEED = 'system-seed'
SYSTEM_SEED_NULL = 'system-seed-null'
@attr.s(auto_attribs=True)
@ -135,7 +136,7 @@ class VolumeStructure:
offset_write: Optional[RelativeOffset] = named_field('offset-write', None)
size: int = 0
type: str = ''
role: Role = Role.NONE
role: str = Role.NONE
id: Optional[str] = None
filesystem: str = ''
content: Optional[List[VolumeContent]] = None