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

Merge pull request #1983 from dbungert/lp-2063252-cryptsetup-warns 

filesystem: swap options
This commit is contained in:
Dan Bungert 2024-04-29 15:18:28 -06:00 committed by GitHub
parent 389a50e194 3f2529bc49
commit a73d997b5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
subiquity/common/filesystem/manipulator.py
View File

@ -180,11 +180,19 @@ class FilesystemManipulator:
delete_lvm_partition = delete_logical_volume delete_lvm_partition = delete_logical_volume
cryptoswap_options = [
"cipher=aes-cbc-essiv:sha256",
"initramfs",
"plain",
"size=256",
"swap",
]
def create_cryptoswap(self, device): def create_cryptoswap(self, device):
dmc = self.model.add_dm_crypt( dmc = self.model.add_dm_crypt(
device, device,
keyfile="/dev/urandom", keyfile="/dev/urandom",
options=["swap", "initramfs"], options=self.cryptoswap_options,
) )
self.create_filesystem(dmc, dict(fstype="swap")) self.create_filesystem(dmc, dict(fstype="swap"))
return dmc return dmc

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

@ -466,6 +466,7 @@ class TestGuided(IsolatedAsyncioTestCase):
self.controller = FilesystemController(self.app) self.controller = FilesystemController(self.app)
self.controller.supports_resilient_boot = True self.controller.supports_resilient_boot = True
self.controller._examine_systems_task.start_sync() self.controller._examine_systems_task.start_sync()
self.controller.cryptoswap_options = ["a", "b"]
self.app.dr_cfg = DRConfig() self.app.dr_cfg = DRConfig()
self.app.base_model.source.current.type = "fsimage" self.app.base_model.source.current.type = "fsimage"
self.app.base_model.source.current.variations = { self.app.base_model.source.current.variations = {
@ -657,7 +658,7 @@ class TestGuided(IsolatedAsyncioTestCase):
self.assertIsNone(swap.fs()) self.assertIsNone(swap.fs())
[dmc] = self.model.all_dm_crypts() [dmc] = self.model.all_dm_crypts()
self.assertEqual("/dev/urandom", dmc.keyfile) self.assertEqual("/dev/urandom", dmc.keyfile)
self.assertEqual(["swap", "initramfs"], dmc.options) self.assertEqual(["a", "b"], dmc.options)
self.assertEqual("swap", dmc.fs().fstype) self.assertEqual("swap", dmc.fs().fstype)
[rpool] = self.model._all(type="zpool", pool="rpool") [rpool] = self.model._all(type="zpool", pool="rpool")
self.assertIsNone(rpool.path) self.assertIsNone(rpool.path)