Make compatible with cryptsetup's encrypt hook
-
Review changes -
-
Download -
Patches
-
Plain diff
This merge request makes archiso
hook compatible with the correct output of the encrypt
hook, that can so be enabled
and configured to handle LUKS encrypted archiso systems.
Changes
When the encrypt
successfully ends, it exports a static root
variable
containing the path of the device mapper representing the root device
(by default /dev/mapper/root
).
Since the root device here is on a file on the bootmnt
and not on a disk directly,
I've changed the cryptsetup encrypt
hook to support an intermediate mount for bootmnt
on /run/cryptdev
.
Compatibility is obtained by bind mounting /run/cryptdev
to bootmnt
and replacing the loopmount with root
if it exists.
Value of archisodevice
has been changed from
/dev/disk/by-label/$archisolabel
to
dev/disk/by-uuid/$archisouuid
to avoid boot problems when multiple archisolabel
'd devices are inserted.
Depends on nested cryptkey support cryptsetup
merge request (where should it be submitted for review?).
Solves #14 and #15 (moved).
See specular MR on archlinux/archiso!217 (closed).
Merge request reports
- version 37d4a20794
- version 369a90be2a
- version 35faa3e53a
- version 34275aedf6
- version 33e8c1bb6f
- version 3278c8e3af
- version 31711d287d
- version 309c08f9b3
- version 2933a51f18
- version 282af0d1b1
- version 270b49c5c0
- version 2653ce32a2
- version 25da9eca8a
- version 24f439b11e
- version 23ae6ed3e7
- version 221951cdf4
- version 217ce61951
- version 207130665b
- version 194f5cc44a
- version 1805f2086f
- version 17a9aba39e
- version 16b44ef789
- version 15b44ef789
- version 14bbbe57b4
- version 1326d44cb8
- version 122a799657
- version 11c0c8f4f8
- version 106f1b027a
- version 9f2103e00
- version 8879a7774
- version 7af253d80
- version 6cbaa15a4
- version 5fd52bfad
- version 4a0ef2b97
- version 3a00734aa
- version 250af46a6
- version 1c7d6f54f
- master (base)
- latest version49e0273338 commits,
- version 37d4a2079437 commits,
- version 369a90be2a36 commits,
- version 35faa3e53a35 commits,
- version 34275aedf634 commits,
- version 33e8c1bb6f33 commits,
- version 3278c8e3af32 commits,
- version 31711d287d31 commits,
- version 309c08f9b330 commits,
- version 2933a51f1829 commits,
- version 282af0d1b128 commits,
- version 270b49c5c027 commits,
- version 2653ce32a226 commits,
- version 25da9eca8a25 commits,
- version 24f439b11e24 commits,
- version 23ae6ed3e723 commits,
- version 221951cdf422 commits,
- version 217ce6195121 commits,
- version 207130665b20 commits,
- version 194f5cc44a19 commits,
- version 1805f2086f18 commits,
- version 17a9aba39e17 commits,
- version 16b44ef78916 commits,
- version 15b44ef78916 commits,
- version 14bbbe57b415 commits,
- version 1326d44cb814 commits,
- version 122a79965713 commits,
- version 11c0c8f4f812 commits,
- version 106f1b027a11 commits,
- version 9f2103e0010 commits,
- version 8879a77749 commits,
- version 7af253d808 commits,
- version 6cbaa15a47 commits,
- version 5fd52bfad6 commits,
- version 4a0ef2b975 commits,
- version 3a00734aa4 commits,
- version 250af46a63 commits,
- version 1c7d6f54f2 commits,
- Side-by-side
- Inline
There are no changes yet
No changes between version 10 and version 10