Merge branch 'anton/fix-containerfile'

Containerfile

@@ -44,11 +44,13 @@ FROM stagex/user-pcsc-lite:sx2025.02.0@sha256:825708912c41d93dd38230f6f481f5876a
 FROM stagex/user-pcsc-tools:sx2025.02.0@sha256:dc609b2eb7ba44f877b481633baa86873e99739573f81fe10d5485eb5a1b4f9d AS user-pcsc-tools
 FROM stagex/user-qemu:sx2025.02.0@sha256:47653f32fb5874d91969a4b206e8f46f26f056dc2adfc88758d57208a6659b03 AS user-qemu
 FROM stagex/user-canokey-qemu:sx2025.02.0@sha256:aba3be44d4b0da2f4ee52fdc2e2cd5b4f6dd05162323015745d2fd194d3074a7 AS user-canokey-qemu
+FROM stagex/user-sdtool:sx2025.02.0@sha256:7543bbfdc39efd94820484ffdc984ec16aac29523d0533c19887d907828e7a9a AS user-sdtool
 FROM stagex/user-seabios:sx2025.02.0@sha256:03eeb1344ad5f94dccdedbb3379906b272b62e246972e9334011746c79f234cf AS user-seabios
 FROM stagex/user-sops:sx2025.02.0@sha256:1eb6f16dcae77f43dddfed09d471a4aca7db3773e7de5352278c3d334927b0dd AS user-sops
 FROM stagex/core-zlib:sx2025.02.0@sha256:15860e0789afa0f3ed1bd4e9d771ecb34fbab399064f6aa69c05e71cb8822156 AS core-zlib
 FROM stagex/user-sequoia-sq:sx2025.02.0@sha256:48b9a0f425604f46a0587e6dcbf81576f32145363dcfbdb86a9c46af659996a6 AS user-sequoia-sq
 FROM stagex/user-sequoia-sq-wot:sx2025.02.0@sha256:aeedcfbe20ff38937a0157fa2047a831f187a53deb319d8bee7848cf52b0cd5f AS user-sequoia-sq-wot
+FROM stagex/core-sqlite3:sx2025.02.0@sha256:ca0e3274fbd2cdfcb418088f7147e865abe025a1cec043c1bade0f4b99185296 AS core-sqlite3
 FROM stagex/user-swtpm:sx2025.02.0@sha256:a13468396caeba89123a414500364967ac90af9541bf01b84821db487d7c7cc9 AS user-swtpm
 FROM stagex/user-syslinux:sx2025.02.0@sha256:b5e74e7384e6b1f21641296e5188073b65761724a91ae55ecaba9b7164de8c3a AS user-syslinux
 FROM stagex/user-tpm2-tools:sx2025.02.0@sha256:bf5d0c4b62dda736043843a5c59d1ed7c7aaf5e50cbcdb3976025e03384eb709 AS user-tpm2-tools
@@ -57,7 +59,6 @@ FROM stagex/user-util-linux:sx2025.02.0@sha256:bf03b1aaa92a3877f2d2a35d2c27cf453
 FROM stagex/user-xorriso:sx2025.02.0@sha256:f3b9f1eebdbc6f2e62a9d4345abb87ea81219fc4afdbdc0412a8a2110282a1a1 AS user-xorriso
 FROM stagex/core-xz:sx2025.02.0@sha256:34824f16967f6bd8ecf24c320e36dfc9cd58d5746d3c524e1b896ebdf5a2e760 AS core-xz
 FROM stagex/user-yq:sx2025.02.0@sha256:9aba3b01cc7d78bc78853121cdcd430a67f543eebae30220f233659039ce6e54 AS user-yq
-FROM stagex/core-zlib:sx2025.02.0@sha256:15860e0789afa0f3ed1bd4e9d771ecb34fbab399064f6aa69c05e71cb8822156 AS core-zlib
 
 FROM scratch AS base
 ARG VERSION development
@@ -73,7 +74,7 @@ COPY --from=user-cpio . /
 COPY --from=user-mtools . /
 COPY --from=user-grub . /
 
-FROM base as dev
+FROM base AS dev
 COPY --from=core-gcc . /
 COPY --from=core-zlib . /
 COPY --from=user-glib . /
@@ -134,6 +135,9 @@ COPY --from=user-opensc . initramfs
 COPY --from=user-util-linux . initramfs
 COPY --from=user-sops . initramfs
 COPY --from=core-gcc /usr/lib/libgcc* initramfs/usr/lib/
+COPY --from=core-sqlite3 . initramfs
+COPY --from=user-sdtool . initramfs
+RUN chmod +x initramfs/usr/bin/sdtool
 COPY --from=user-openpgp-card-tools . initramfs
 COPY --from=user-sequoia-sq . initramfs
 COPY --from=user-sequoia-sq-wot . initramfs

Makefile

@@ -3,6 +3,8 @@ GIT_REF := $(shell git log -1 --format=%H)
 GIT_AUTHOR := $(shell git log -1 --format=%an)
 GIT_PUBKEY := $(shell git log -1 --format=%GK)
 GIT_TIMESTAMP := $(shell git log -1 --format=%cd --date=iso)
+EFI := false
+,:=,
 export
 
 ## Use env vars from latest release when reproducing
@@ -68,8 +70,14 @@ vm: out/dev-shell.digest out/airgap.iso out/sdcard.img
 			-device sd-card,drive=external \
 			-drive id=external,if=none,format=raw,file=out/sdcard.img \
 			-device usb-storage,drive=usbdrive \
+			$(if $(filter $(EFI),true) ,\
+				-bios /usr/share/ovmf/OVMF.fd \
+				-drive id=boot$(,)if=virtio$(,)format=raw$(,)file=out/airgap.iso \
+			,\
 				-drive id=usbdrive,if=none,format=raw,file=out/airgap.iso \
 				-boot order=c \
+			) \
+			$(if (,$(wildcard /dev/kvm)),,-cpu host --accel kvm) \
 			-nographic; \
 		"
 

config/grub.cfg

@@ -1,5 +1,5 @@
 set timeout=1
 menuentry "Linux Airgap" {
-    linux /boot/vmlinuz init=/init console=ttyS0 console=tty0 ro
+    linux /boot/vmlinuz init=/init console=ttyS0 console=tty0 ro loglevel=3
     initrd /boot/initramfs
 }

rootfs/etc/profile

@@ -2,6 +2,7 @@ export EDITOR=/bin/vi
 export PATH="/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin"
 export PS1="[\h \t] \\$ "
 export GNUPGHOME=/.gnupg
+export XDG_RUNTIME_DIR=/tmp
 source /etc/environment
 cd /root
 clear