Containerfile

@@ -66,14 +66,11 @@ FROM stagex/user-linux-airgap@sha256:4f163e5f1f09f87d8f0fcf060193345f0b4dd8dbff2
 FROM stagex/user-libimobiledevice-glue@sha256:3ce674285cbc04b694b7e400703868fcaac65401f2f2ca2aa2b720b3e0efee3c AS user-libimobiledevice-glue
 FROM stagex/user-libimobiledevice@sha256:fcda68bdc397213fa76bd893472a304b093522aaac28e36f458275b93bb1af34 AS user-libimobiledevice
 FROM stagex/user-libplist@sha256:2d776cb4eca3689a8bd6ac755a23f492850bf6c7b0c72e3525db6135e4d6e0bc AS user-libplist
+FROM stagex/user-libusb@sha256:53d499555164f12d9e87118a6d44e1d07f0b1cc9081a29eb66975662be818a00 AS user-libusb
 FROM stagex/user-libusbmuxd@sha256:1e97f0a2ede0ee5fac9b056d0395e12b77c9f0bf550f9d0c20734ce0617eb51f AS user-libusbmuxd
 FROM stagex/user-usbmuxd@sha256:90f687d2368328b76141badc382a21873a5b44d4ddccf851c017caf1e78af418 AS user-usbmuxd
 FROM stagex/user-socat@sha256:990a70ae13462d8ba0a925fe959dd83070cbecdb3f91ff145caca5232171f3b8 AS user-socat
 FROM stagex/user-dhcpcd@sha256:60bd86d9e2fcb6341c1efaeda5d786b63ff92e9d0c729cd8f634a20ff54ee71e AS user-dhcpcd
-FROM stagex/user-guestctl@sha256:95ad9e34a003c7d1d01f5d427b5f79d2430f6e6634debde8e54f9a6f08749704 AS user-guestctl
-FROM stagex/core-ncurses@sha256:6602a073bf9a408d1ed7c20ccc98fca974cd307fb8d1da6381fbca684a08169c AS core-ncurses
-FROM stagex/user-libevent@sha256:1ba6f006f49cc327a5da84caeb0de7088da844f8021c5902fe387cd379732aec AS user-libevent
-FROM stagex/user-tmux@sha256:57b63a27169a333edb073f1c6646a37ec6a9eee02ffdbc494a52bd6d670fc576 AS user-tmux
 
 FROM scratch AS base
 ARG VERSION development
@@ -135,7 +132,6 @@ COPY --from=user-glib . initramfs
 COPY --from=user-numactl . initramfs
 COPY --from=user-dhcpcd . initramfs
 COPY --from=user-qemu /usr/bin/qemu-ga initramfs/usr/bin/
-COPY --from=core-curl . initramfs
 
 COPY src/guest/rootfs/ initramfs
 RUN <<-EOF
@@ -249,10 +245,6 @@ COPY --from=user-socat . initramfs
 COPY --from=user-libzbar . initramfs
 COPY --from=user-keyfork . initramfs
 COPY --from=user-icepick . initramfs
-COPY --from=user-guestctl . initramfs
-COPY --from=user-libevent . initramfs
-COPY --from=core-ncurses . initramfs
-COPY --from=user-tmux . initramfs
 COPY src/host/rootfs/ initramfs
 COPY <<-EOF initramfs/etc/environment
     export VERSION="$VERSION"

Makefile

@@ -4,7 +4,6 @@ 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
-GUI := false
 ,:=,
 export
 
@@ -52,32 +51,6 @@ out/dev-shell.digest: Containerfile | out
 shell: out/dev-shell.digest
 	docker run -it $(shell cat $<) /bin/sh
 
-.PHONY: system-vm
-system-vm:
-	qemu-system-x86_64 \
-		-m 4G \
-		-machine q35,kernel-irqchip=split \
-		-usb \
-		-device sdhci-pci \
-		-device sd-card,drive=external \
-		-drive id=external,if=none,format=raw,file=out/sdcard.img \
-		-device usb-storage,drive=usbdrive \
-		-device intel-iommu,intremap=on \
-		-netdev user,id=net0 \
-		-device e1000,netdev=net0 \
-		-chardev socket,path=out/qga.sock,server=on,wait=off,id=qga0 \
-		-device virtio-serial \
-		-device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 \
-		$(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,) \
-		$(if $(filter $(GUI),true),,-nographic)
-
 .PHONY: vm
 vm: out/dev-shell.digest out/airgap.iso out/sdcard.img
 	docker run -it -v ./out:/out $(shell cat $<) sh -c "\

dist/manifest.8E401478A3FBEF72.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEiII6deyqeGsP84sUjkAUeKP773IFAmglbi8ACgkQjkAUeKP7
-73I7Rg/+MQ4yDhcnwBBtlN651Kcou5Z7EhAY5S9stg69yfqWL0MacNGRnEmNHYix
-0J39xeYvP/dSsXYWgW04f0w4FS+msuqK9ML3YbB3Ei7GH4c+Bizhoj415chSMOlo
-R97Gz2V+SZ83Ph51+ORA4DUZ3/PIoXfv5syTKmcrioUP9XhCou61TCqN4fMGgXpq
-5F4awAZRrTtw+67dcEOmSQ7+TbNsMhJIei5Bg8FdPNS2VuMuUGTMrwsL7FBXIg1j
-2J4tXUhZvLz7x3i0nuVlELfd6w1dDHW77e9rCmifGd4QRN+gqUGoOjp93HgnsUrJ
-ASY0BKWfHeHcxpT2qtUuKZuBBjtGkGM9YQSUXYvuzhJp9XEZb9GHBMVo1TvX0sZr
-jWyUVSBlcZuOlG5iGMF8D44nJOX4QikPuGLOJxmG2pOiFvh32qsTA50HV6/BEzZr
-s5zm1IgsdF1SDPrxiqRPjZyvZYcF2kZtqxkzXEJzdPwcqCR9VXHo7InU7OrSg1D0
-T/4wvsz50gsck1UvhEKukBVaWBmyzjHdnUPelOSbiUfn8xSKeL9RGGktV6tF3bUq
-M1yBYp8Bpm3TteqGgeaUjJ5xSRGjynJrlFm+6YSJhf4AOVaex/Tysdlkg8ylQZLn
-IrfZXgpmazBLKHtxQKyr4znWqN+DptMt6W7kPCwejQjiN5WH494=
-=BFLb
------END PGP SIGNATURE-----

dist/manifest.DC4B7D1F52E0BA4D.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE4QZ4HgB6uRyYnbMyRKhs/x/fDoUFAmfCNtYACgkQRKhs/x/f
+DoVzmQ//cLQHFTu/EbgxbS8qgVv+kuVR7+KPAxDyY89pIKdTrKWzfrUvY+A3YfS0
+hsXhehjmVNzaxFxWQvZ+iRBMSv3ypR/6/ui5DwpalLlnlWiFFlW/0lYakpuR1oa3
+iq2CrlN9QdZ5de2jJXJilIYlkWRgyj8HQ/p3d+XzNLQ4Wtl9m8kQTSZ0tnfWDCi5
+dFf+y7VjlgQSAwsC8T21zbH7P0ZwkaUhd8+ybEVB4oazZaMUdr0Zftu1Snp432Yu
+PKeJWT+8RsrTr57Hvf0JFTTbJKyAqe+3VbwRV66FOn2ycxCyJT6JuRJ/SzmhiCRu
+YeYdev7LEZFIUKoTSWL51DdyQfOuw+oC3v28c8hSDlwT/KD+x/JFbAI5+ln1O+HY
+LjB+bDeE0bD4oWHrJn3hul+iKeFjXpfj8gYqURJuF+IJ0epOv1G2JB8brzM9vtJK
+Sgu0A0kvOTpzdvyHALeHY6OtUlgD8dG/wuD/mheR242f4OjDfxcVM5Y966waCxMb
+jwgdS8sBAn417ZNAtw6biUmx3W8qdYsDzYJS4kvkWeqsUS8KtfV2b3RAlNkrxUsR
+sBhB6opEEzzpbMgXhRcS2mA+PDQGSksE09tTOlxuwtmYeXTowspVTzcnGgXcFyb+
+mpBD+uRwR2FBcKSiqlNA3XHIMLDYb3gx7RvmroHeqqtAkQPAALc=
+=8hAc
+-----END PGP SIGNATURE-----

dist/manifest.E90A401336C8AAA9.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEZ1U/vaRrtxq9LgsLjkeh7DWhVR0FAmfBsAQACgkQjkeh7DWh
+VR2Gbg/+N80OV8+qrnamiy2p7IlAvfWi5sepTTDTjL+jXNb9DdIaUIPSFFe0bBf8
+hp75G/y7gZpuubuy8n4hKf0j2IeIZez9j+HDGicAIcdSaNij4aES65r6w7xi2AAn
+s4dWw+yJSymni24iwQkP6csu0ja+aauB7/0U6VHtL4w2GxjcXGZU0FXToQ6fB8hv
+TavjBlyv5D/a9QKdyaNulEYMF7fvpxe+lMoF4miq3goLiI3DuFM+NH5P48nN1W4G
+AHH9OUHFRMBdZUGTYF4i5KJGNnfryRIR99J3L2n9xKetwOpz8bLxinjEZG8tjws5
+RQ3IlwvW/6jNSDt2zU6dk1DKYx3inndlA9BvJtkrksig/OB9HaxosjrOaI267OCc
+iM7xNIZQxJJ9UTOSA5Q1QTHxu2wzYL6GaHlilD7RZEZn0X4O4JveH3zeCdLwMk2l
+kf27XbFxLMf/7q8ekPJl791pPBRD6A+v0FNw8WedgQwd/Pdg9qTerRoVKXsmCUGr
+tXBiobDnZ2daE5iB96PGJsACE+Jat+QEwWrE3V3ILun9ewu3TP5LUQMYEktS0UHd
+fFdXO790GK+TZKvyJ0z7J0VBoGHS+D/1G35VLAHyNQXULOYK56GKwpwZeHVWykVt
+h7cnGBwo+IfdMTYN6h7U9l35nj06HtRbylB2VVZdtWV3FediqSg=
+=9U0u
+-----END PGP SIGNATURE-----

dist/manifest.txt

@@ -1,2 +1,2 @@
-cafe1d794f8bb10e652da130e7f3f2f1a13e0ee89f54fdb6385b6fb191a22221 airgap.iso
-eed8667982e86e41f2ebd1331f408e93ac5ef2a574ee23e7635cbb23506aec73 release.env
+46c1b23cadb6c03b175e713d91b809c91a2768273249b1bd2506d05307dff9de airgap.iso
+c09b5ab32791fa001c004e7b59cd0a6f0f9f3a3503cb600a8ec2c19d2e2b00c1 release.env

dist/release.env

@@ -1,5 +1,5 @@
-VERSION=development
-GIT_REF=bdc971a931bf9fc51395beb5afd328d8b493a801
-GIT_AUTHOR=Anton Livaja
-GIT_PUBKEY=44A86CFF1FDF0E85
-GIT_TIMESTAMP=2025-05-14 19:12:21 -0700
+VERSION=2025.02.0
+GIT_REF=dca180550e7b317938f40793aacbbbeede216b9f
+GIT_AUTHOR=Lance R. Vick
+GIT_PUBKEY=8E47A1EC35A1551D
+GIT_TIMESTAMP=2025-02-28 04:26:59 -0800

src/host/rootfs/etc/inittab

@@ -10,7 +10,6 @@
 # Startup the system
 ::sysinit:/bin/mount -t devtmpfs devtmpfs /dev
 ::sysinit:/bin/mkdir -p /proc /run /dev/pts /dev/shm /sys
-::sysinit:/bin/mount -t devpts devpts /dev/pts
 ::sysinit:/bin/mount -t sysfs sysfs /sys
 ::sysinit:/bin/mount -t proc proc /proc
 ::sysinit:/bin/mount -o remount,rw /
@@ -22,8 +21,8 @@ null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr
 # now run any rc scripts
 ::sysinit:/etc/init.d/rcS
 
-# Put a shell on serial and tmux on console
-console::respawn:-/bin/bash -l -c /bin/tmux
+# Put shells on the serial terminal and console
+console::respawn:-/bin/bash
 ttyS0::respawn:-/bin/bash
 
 # Stuff to do for the 3-finger salute

src/host/rootfs/etc/profile

@@ -1,10 +1,4 @@
-case "$TERM" in
-  linux|linux-*)
-    export TERM=linux-16color
-    ;;
-esac
 export EDITOR=/bin/vi
-export SHELL=/bin/bash
 export PATH="/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin"
 export PS1="[\h \t] \\$ "
 export GNUPGHOME=/.gnupg

src/host/rootfs/etc/tmux.conf

@@ -1,36 +0,0 @@
-# Zero-based indexing is sure great in programming languages,
-# but not so much in terminal multiplexers where that zero is
-# all the way on the other side of the keyboard.
-set-option -g base-index 1
-
-set-option -g status on
-set-option -g status-interval 1
-
-# We should not have more than one session, but it's still possible.
-# Therefore...
-set-option -g status-left "[#S] "
-
-# Just so we can use `-ag` properly later
-set-option -g status-right ""
-
-# The current power battery level
-set-option -ag status-right '#(test -d /sys/class/power_supply/BAT0 && printf " [%%s%%%%]" "$(cat /sys/class/power_supply/BAT0/capacity)")'
-
-# Current date and time, in case it's relevant, and has drifted
-set-option -ag status-right " [%Y-%m-%d %H:%M:%S]"
-
-# because cyan on black is cool, and pops out
-set-option -g status-style "bg=color0 fg=color6"
-set-option -g status-position bottom
-
-# we don't have much screen space, let's limit what's displayed
-set-window-option -g window-status-bell-style "bold"
-set-window-option -g window-status-current-format "#I:#W"
-set-window-option -g window-status-format "#I:#W"
-
-# our "focused" window and pane is the brighter one
-set-window-option -g window-status-style "fg=color6"
-set-window-option -g window-status-current-style "fg=color14"
-set-option -g pane-border-style "fg=color6"
-set-option -g pane-active-border-style "fg=color14"
-set-option -g message-style "fg=color6 bg=color0"