mkosi-initrd: honor x-initrd.attach options in crypttab

[aafeijoo-suse]

Entries in /etc/crypttab with the x-initrd.attach option are intended to be set up in the initrd.

[behrmann]

The code between fstab and crypttab is largely the same and should go into a shared function.

[DaanDeMeyer]

So systemd already parses /sysroot/etc/fstab from inside the initrd, so I'm wondering if the /etc/fstab changes are really necessary?

[aafeijoo-suse]

So systemd already parses /sysroot/etc/fstab from inside the initrd, so I'm wondering if the /etc/fstab changes are really necessary?

That is a good point. Simple test:

localhost:/home/dev # grep x-initrd.mount /etc/fstab
UUID=...  /var        btrfs  subvol=/@/var,x-initrd.mount        0  0
UUID=...  /root       btrfs  subvol=/@/root,x-initrd.mount       0  0

• Without custom fstab in the initrd:

# journalctl -b-1 -o short-monotonic | grep -e root.mount -e var.mount -e Switching -e fstab
[    7.361337] localhost systemd[1]: Mounting sysroot.mount...
[    7.377509] localhost systemd[1]: Mounted sysroot.mount.
[    7.383766] localhost systemd-sysroot-fstab-check[504]: /sysroot/var should be mounted in the initrd, will request daemon-reload.
[    7.487911] localhost systemd-sysroot-fstab-check[504]: Requesting initrd-fs.target/start/replace...
[    7.500733] localhost systemd[1]: sysroot-root.mount: Directory /sysroot/root to mount over is not empty, mounting anyway.
[    7.500902] localhost systemd-sysroot-fstab-check[504]: Requesting swap.target/start/replace...
[    7.501448] localhost systemd[1]: Mounting sysroot-root.mount...
[    7.501782] localhost systemd[1]: sysroot-var.mount: Directory /sysroot/var to mount over is not empty, mounting anyway.
[    7.503385] localhost systemd[1]: Mounting sysroot-var.mount...
[    7.525342] localhost systemd[1]: Mounted sysroot-root.mount.
[    7.526440] localhost systemd[1]: Mounted sysroot-var.mount.
[    7.662725] localhost systemd[1]: Switching root.

• With it:

# journalctl -b -o short-monotonic | grep -e root.mount -e var.mount -e Switching -e fstab
[    8.230834] localhost systemd[1]: root.mount: Directory /root to mount over is not empty, mounting anyway.
[    8.231434] localhost systemd[1]: Mounting root.mount...
[    8.231707] localhost systemd[1]: var.mount: Directory /var to mount over is not empty, mounting anyway.
[    8.233396] localhost systemd[1]: Mounting var.mount...
[    8.246182] localhost systemd[1]: Mounting sysroot.mount...
[    8.250963] localhost systemd[1]: Mounted root.mount.
[    8.251415] localhost systemd[1]: Mounted var.mount.
[    8.256304] localhost systemd[1]: Mounted sysroot.mount.
[    8.262160] localhost systemd-sysroot-fstab-check[509]: /sysroot/var should be mounted in the initrd, will request daemon-reload.
[    8.370742] localhost systemd-sysroot-fstab-check[509]: Requesting initrd-fs.target/start/replace...
[    8.384198] localhost systemd[1]: sysroot-root.mount: Directory /sysroot/root to mount over is not empty, mounting anyway.
[    8.384767] localhost systemd-sysroot-fstab-check[509]: Requesting swap.target/start/replace...
[    8.385252] localhost systemd[1]: Mounting sysroot-root.mount...
[    8.385632] localhost systemd[1]: sysroot-var.mount: Directory /sysroot/var to mount over is not empty, mounting anyway.
[    8.386926] localhost systemd[1]: Mounting sysroot-var.mount...
[    8.409683] localhost systemd[1]: Mounted sysroot-root.mount.
[    8.411513] localhost systemd[1]: Mounted sysroot-var.mount.
[    8.507986] localhost systemd[1]: Switching root.

[DaanDeMeyer]

So without /etc/fstab in the initrd /root and /var are still mounted in /sysroot which is what you want? Or am I misunderstanding?

[aafeijoo-suse]

So without /etc/fstab in the initrd /root and /var are still mounted in /sysroot which is what you want? Or am I misunderstanding?

No, you understood correctly, it's not necessary here. Thanks!

[behrmann]

LGTM code-wise