Skip to content

Commit

Permalink
mkosi-initrd: honor x-initrd.attach options in crypttab
Browse files Browse the repository at this point in the history
  • Loading branch information
aafeijoo-suse committed Oct 22, 2024
1 parent 06c4498 commit a70dc3f
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions mkosi/initrd.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,20 @@ def main() -> None:

cmdline += ["--sandbox-tree", sandbox_tree]

# Generate crypttab with all the x-initrd.attach entries
if Path("/etc/crypttab").exists():
crypttab = []
for line in Path("/etc/crypttab").read_text().splitlines():
entry = line.split()
if len(entry) < 4 or entry[0].startswith("#") or "x-initrd.attach" not in entry[3]:
continue
crypttab.append(line)
if crypttab:
with (Path(staging_dir) / "crypttab").open("w") as f:
f.write("# Automatically generated by mkosi-initrd\n")
f.write("\n".join(crypttab))
cmdline += ["--extra-tree", f"{staging_dir}/crypttab:/etc/crypttab"]

# Prefer dnf as dnf5 has not yet officially replaced it and there's a much bigger chance that there
# will be a populated dnf cache directory.
run(
Expand Down

0 comments on commit a70dc3f

Please sign in to comment.