Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions elements/flatcar/flatcar-zfs.bst
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,12 @@ config:
# Also preserve the raw sysext image under /usr/lib/sysexts for runtime sysext usage
mkdir -p "%{install-root}/usr/lib/sysexts"
install -D -m 0644 flatcar-zfs.raw "%{install-root}/usr/lib/sysexts/zfs.raw"

# Drop Flatcar's udevd sysext ordering override. In Flatcar, ZFS is loaded as
# a runtime sysext, so udevd was ordered After=systemd-sysext.service.
# In Bluefin Server, ZFS is extracted directly into the OS rootfs at build time.
# Leaving this drop-in causes systemd-udevd to wait for systemd-sysext.service,
# which waits for local-fs.target, which waits for var.mount, which waits for
# the udev device unit — creating a boot deadlock.
rm -f "%{install-root}/usr/lib/systemd/system/systemd-udevd.service.d/10-zfs.conf"
rmdir "%{install-root}/usr/lib/systemd/system/systemd-udevd.service.d" 2>/dev/null || true
31 changes: 31 additions & 0 deletions tests/unit/test_installer_contract.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
)
JUSTFILE = REPO_ROOT / "Justfile"
DDI_ELEMENT = REPO_ROOT / "elements" / "oci" / "bluefin-server-ddi.bst"
FLATCAR_ZFS_ELEMENT = REPO_ROOT / "elements" / "flatcar" / "flatcar-zfs.bst"


def _published_uki_cmdline(installer_element: str) -> str:
Expand Down Expand Up @@ -135,3 +136,33 @@ def test_installer_and_ddi_strip_vmlinux_and_static_archives() -> None:
assert "find /layer -type f -name '*.a' -delete" in installer_element
assert 'rm -f "/layer/usr/lib/modules/${KVER}/vmlinux"' in ddi_element
assert "find /layer -type f -name '*.a' -delete" in ddi_element


def test_flatcar_zfs_removes_udevd_sysext_ordering_dropin() -> None:
flatcar_zfs = FLATCAR_ZFS_ELEMENT.read_text(encoding="utf-8")

assert (
'rm -f "%{install-root}/usr/lib/systemd/system/systemd-udevd.service.d/10-zfs.conf"'
in flatcar_zfs
)


def test_var_partition_contracts_use_consistent_partlabel() -> None:
import base64

repart_var = (
REPO_ROOT / "files" / "installer" / "repart.d" / "30-var.conf"
).read_text(encoding="utf-8")
ddi_element = DDI_ELEMENT.read_text(encoding="utf-8")
var_mount = (
REPO_ROOT / "files" / "os" / "systemd" / "system" / "var.mount"
).read_text(encoding="utf-8")
justfile = JUSTFILE.read_text(encoding="utf-8")

assert "Label=var" in repart_var
assert "/dev/disk/by-partlabel/var /var xfs defaults 0 0" in ddi_element
assert "What=/dev/disk/by-partlabel/var" in var_mount
expected_b64 = base64.b64encode(
b"/dev/disk/by-partlabel/var /var xfs defaults 0 0\n"
).decode("ascii")
assert expected_b64 in justfile
Loading