Merge ~dbungert/curtin:cryptoswap-dmc-type into curtin:master
Status: | Merged |
---|---|
Merged at revision: | e01fe404124d6e03be3960d190dc0278334fb23a |
Proposed branch: | ~dbungert/curtin:cryptoswap-dmc-type |
Merge into: | curtin:master |
Diff against target: |
194 lines (+119/-7) 3 files modified
curtin/commands/block_meta.py (+10/-7) tests/integration/test_block_meta.py (+7/-0) tests/unittests/test_commands_block_meta.py (+102/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Server Team CI bot | continuous-integration | Approve | |
Michael Hudson-Doyle | Approve | ||
Review via email: mp+460874@code.launchpad.net |
Commit message
dm_crypt: create and use cryptoswap as PLAIN
Previously, cryptoswap was acting strangely, in that at install time it
was considered to be a LUKS2 device and durign actual system use it
would be considered a PLAIN device, in the cryptsetup(8) meanings of
these terms.
This caused problems when attempting to reference the device, as we
would do get_volume_spec(), the returned /dev/disk/
value would be wrong - it would change from dm-uuid-
dm-uuid-
As the real runtime behavior is to be a PLAIN device for cryptoswap,
stop creating it as a LUKS2 device and just use it as a PLAIN device,
which doesn't involve a "create" step at all, you just open it as PLAIN
directly.
PASSED: Continuous integration, rev:b237c99786e b5d7f65363de84e 540ced2a3d1691 /jenkins. canonical. com/server- team/job/ curtin- ci/226/ /jenkins. canonical. com/server- team/job/ curtin- ci/nodes= metal-amd64/ 226/ /jenkins. canonical. com/server- team/job/ curtin- ci/nodes= metal-arm64/ 226/ /jenkins. canonical. com/server- team/job/ curtin- ci/nodes= metal-ppc64el/ 226/ /jenkins. canonical. com/server- team/job/ curtin- ci/nodes= metal-s390x/ 226/
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/server- team/job/ curtin- ci/226/ /rebuild
https:/