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

types: rename ZFS_LUKS -> ZFS_LUKS_KEYSTORE 

Clarify that the implemented mechanism is the keystore setup.  An
implementation that doesn't use native ZFS encryption is plausibly
interesting, which is a better use of the term ZFS_LUKS.
This commit is contained in:
Dan Bungert 2024-02-21 11:49:24 -07:00
parent 98ca9cdfa8
commit f60290bb11
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
subiquity/common/types.py
View File

@ -347,7 +347,7 @@ class GuidedCapability(enum.Enum):
LVM = enum.auto() LVM = enum.auto()
LVM_LUKS = enum.auto() LVM_LUKS = enum.auto()
ZFS = enum.auto() ZFS = enum.auto()
ZFS_LUKS = enum.auto() ZFS_LUKS_KEYSTORE = enum.auto()
CORE_BOOT_ENCRYPTED = enum.auto() CORE_BOOT_ENCRYPTED = enum.auto()
CORE_BOOT_UNENCRYPTED = enum.auto() CORE_BOOT_UNENCRYPTED = enum.auto()
@ -384,7 +384,7 @@ class GuidedCapability(enum.Enum):
def is_zfs(self) -> bool: def is_zfs(self) -> bool:
return self in [ return self in [
GuidedCapability.ZFS, GuidedCapability.ZFS,
GuidedCapability.ZFS_LUKS, GuidedCapability.ZFS_LUKS_KEYSTORE,
] ]

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

@ -217,7 +217,7 @@ class VariationInfo:
GuidedCapability.LVM, GuidedCapability.LVM,
GuidedCapability.LVM_LUKS, GuidedCapability.LVM_LUKS,
GuidedCapability.ZFS, GuidedCapability.ZFS,
GuidedCapability.ZFS_LUKS, GuidedCapability.ZFS_LUKS_KEYSTORE,
] ]
), ),
) )

6
subiquity/server/controllers/tests/test_filesystem.py
View File

@ -76,7 +76,7 @@ default_capabilities = [
GuidedCapability.LVM, GuidedCapability.LVM,
GuidedCapability.LVM_LUKS, GuidedCapability.LVM_LUKS,
GuidedCapability.ZFS, GuidedCapability.ZFS,
GuidedCapability.ZFS_LUKS, GuidedCapability.ZFS_LUKS_KEYSTORE,
] ]
@ -590,7 +590,7 @@ class TestGuided(IsolatedAsyncioTestCase):
self.assertEqual("zfs", zfs_boot.type) self.assertEqual("zfs", zfs_boot.type)
@parameterized.expand(boot_expectations) @parameterized.expand(boot_expectations)
async def test_guided_zfs_luks(self, bootloader, ptable, p1mnt): async def test_guided_zfs_luks_keystore(self, bootloader, ptable, p1mnt):
await self._guided_setup(bootloader, ptable) await self._guided_setup(bootloader, ptable)
target = GuidedStorageTargetReformat( target = GuidedStorageTargetReformat(
disk_id=self.d1.id, allowed=default_capabilities disk_id=self.d1.id, allowed=default_capabilities
@ -598,7 +598,7 @@ class TestGuided(IsolatedAsyncioTestCase):
await self.controller.guided( await self.controller.guided(
GuidedChoiceV2( GuidedChoiceV2(
target=target, target=target,
capability=GuidedCapability.ZFS_LUKS, capability=GuidedCapability.ZFS_LUKS_KEYSTORE,
password="passw0rd", password="passw0rd",
) )
) )