diff --git a/Justfile b/Justfile index f2dc1b23..eb4cff83 100644 --- a/Justfile +++ b/Justfile @@ -327,7 +327,7 @@ test-installer-artifact: -drive if=pflash,format=raw,readonly=on,file="$OVMF_CODE" \ -drive if=pflash,format=raw,file="$WORKDIR/ovmf-vars.fd" \ -nic user,model=virtio-net-pci,hostfwd=tcp:127.0.0.1:8080-:8080 \ - -smbios "type=11,value=io.systemd.credential.binary:fstab.extra=L2Rldi9kaXNrL2J5LXBhcnRsYWJlbC92YXIgL3ZhciB4ZnMgZGVmYXVsdHMgMCAwCg==" \ + -smbios "type=11,value=io.systemd.credential.binary:fstab.extra=TEFCRUw9dmFyIC92YXIgeGZzIGRlZmF1bHRzIDAgMAo=" \ -smbios "type=11,value=io.systemd.stub.kernel-cmdline-extra=console=tty0 console=ttyS0,,115200 systemd.mask=systemd-firstboot.service" \ -nographic \ -serial file:"$SERIAL_LOG" \ diff --git a/elements/oci/bluefin-server-ddi.bst b/elements/oci/bluefin-server-ddi.bst index 9f801570..1e6a03fd 100644 --- a/elements/oci/bluefin-server-ddi.bst +++ b/elements/oci/bluefin-server-ddi.bst @@ -63,8 +63,13 @@ config: # Ensure standard /etc/hosts exists for container runtimes (containerd/podman) printf '127.0.0.1 localhost\n::1 localhost ip6-localhost ip6-loopback\n' > /layer/etc/hosts - # Ensure persistent /var is mounted from its partition label - printf '/dev/disk/by-partlabel/var /var xfs defaults 0 0\n' > /layer/etc/fstab + # Provide /bin/sh -> bash compatibility symlinks + mkdir -p /layer/usr/bin /layer/bin + ln -sf bash /layer/usr/bin/sh + [ -e /layer/bin/sh ] || ln -sf /usr/bin/bash /layer/bin/sh + + # Ensure persistent /var is mounted from its filesystem label + printf 'LABEL=var /var xfs defaults 0 0\n' > /layer/etc/fstab # Ensure all standard virtual, serial, and hypervisor consoles allow root login printf 'tty0\ntty1\ntty2\ntty3\ntty4\ntty5\ntty6\nttyS0\nttyS1\nconsole\nhvc0\n' > /layer/etc/securetty diff --git a/elements/oci/bluefin-server-installer.bst b/elements/oci/bluefin-server-installer.bst index 44d9f300..c969ae9f 100644 --- a/elements/oci/bluefin-server-installer.bst +++ b/elements/oci/bluefin-server-installer.bst @@ -79,6 +79,13 @@ config: fi done + # Provide /bin/sh -> bash compatibility symlinks + mkdir -p /layer/usr/bin /layer/bin /target-root/usr/bin /target-root/bin + ln -sf bash /layer/usr/bin/sh + [ -e /layer/bin/sh ] || ln -sf /usr/bin/bash /layer/bin/sh + ln -sf bash /target-root/usr/bin/sh + [ -e /target-root/bin/sh ] || ln -sf /usr/bin/bash /target-root/bin/sh + # systemd-native initrd: /init -> PID 1 ln -sf usr/lib/systemd/systemd /layer/init # Mount points needed by the installer service diff --git a/files/os/systemd/system/var.mount b/files/os/systemd/system/var.mount index bb6671aa..f27fb576 100644 --- a/files/os/systemd/system/var.mount +++ b/files/os/systemd/system/var.mount @@ -5,7 +5,7 @@ Conflicts=umount.target Before=local-fs.target umount.target [Mount] -What=/dev/disk/by-partlabel/var +What=/dev/disk/by-label/var Where=/var Type=xfs Options=defaults diff --git a/tests/unit/test_installer_contract.py b/tests/unit/test_installer_contract.py index d423c685..eb328fac 100644 --- a/tests/unit/test_installer_contract.py +++ b/tests/unit/test_installer_contract.py @@ -2,6 +2,7 @@ from __future__ import annotations +import base64 import re from pathlib import Path @@ -14,6 +15,7 @@ ) JUSTFILE = REPO_ROOT / "Justfile" DDI_ELEMENT = REPO_ROOT / "elements" / "oci" / "bluefin-server-ddi.bst" +VAR_MOUNT = REPO_ROOT / "files" / "os" / "systemd" / "system" / "var.mount" def _published_uki_cmdline(installer_element: str) -> str: @@ -135,3 +137,27 @@ 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_var_mount_contracts_use_filesystem_label() -> None: + ddi_element = DDI_ELEMENT.read_text(encoding="utf-8") + justfile = JUSTFILE.read_text(encoding="utf-8") + var_mount = VAR_MOUNT.read_text(encoding="utf-8") + + assert "printf 'LABEL=var /var xfs defaults 0 0\\n' > /layer/etc/fstab" in ddi_element + assert "What=/dev/disk/by-label/var" in var_mount + + match = re.search(r"io\.systemd\.credential\.binary:fstab\.extra=([A-Za-z0-9+/=]+)", justfile) + assert match, "fstab.extra credential should be defined in Justfile" + decoded = base64.b64decode(match.group(1)).decode("utf-8") + assert decoded.strip() == "LABEL=var /var xfs defaults 0 0" + + +def test_sh_compatibility_symlinks_configured() -> None: + ddi_element = DDI_ELEMENT.read_text(encoding="utf-8") + installer_element = INSTALLER_ELEMENT.read_text(encoding="utf-8") + + assert "ln -sf bash /layer/usr/bin/sh" in ddi_element + assert "ln -sf bash /layer/usr/bin/sh" in installer_element + assert "ln -sf bash /target-root/usr/bin/sh" in installer_element +