A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
feat(rootfs): podroid-vsock OpenRC service + initial forwards.conf
ExTv64a1e10596b8
diff --git a/build-rootfs/build-rootfs.sh b/build-rootfs/build-rootfs.shindex be84e42..5b0f55b 100755--- a/build-rootfs/build-rootfs.sh+++ b/build-rootfs/build-rootfs.sh@@ -93,6 +93,7 @@ cp /work/files/etc/init.d/podroid-network "$ROOTFS/etc/init.d/"cp /work/files/etc/init.d/podroid-resize "$ROOTFS/etc/init.d/"cp /work/files/etc/init.d/podroid-ready "$ROOTFS/etc/init.d/"cp /work/files/etc/init.d/podroid-x11 "$ROOTFS/etc/init.d/"+cp /work/files/etc/init.d/podroid-vsock "$ROOTFS/etc/init.d/"chmod +x "$ROOTFS/etc/init.d/podroid-"*# Copy /usr/local/bin scripts (resize daemon + login wrapper + getty selector)@@ -107,6 +108,10 @@ chmod +x "$ROOTFS/usr/local/bin/podroid-vsock-agent" 2>/dev/null || truechmod +x "$ROOTFS/usr/local/bin/podroid-"*mkdir -p "$ROOTFS/etc/conf.d"cp /work/files/etc/conf.d/podroid "$ROOTFS/etc/conf.d/"+# vsock agent's initial forward table (read at podroid-vsock startup).+mkdir -p "$ROOTFS/etc/podroid"+cp /work/files/etc/podroid/forwards.conf "$ROOTFS/etc/podroid/forwards.conf"+chmod 0644 "$ROOTFS/etc/podroid/forwards.conf"cp /work/files/etc/inittab "$ROOTFS/etc/inittab"cp /work/files/etc/rc.conf "$ROOTFS/etc/rc.conf"@@ -144,7 +149,7 @@ EOF# Set runlevels via direct symlinks (host is x86_64, can't chroot into aarch64 rootfs to run rc-update).# rc-update is just `ln -s /etc/init.d/X /etc/runlevels/<level>/X` under the hood.mkdir -p "$ROOTFS/etc/runlevels/default" "$ROOTFS/etc/runlevels/boot"-for svc in podroid-bootstrap podroid-network podroid-resize dropbear docker lxc dnsmasq.lxcbr0 podroid-x11 podroid-ready; do+for svc in podroid-bootstrap podroid-network podroid-resize dropbear docker lxc dnsmasq.lxcbr0 podroid-x11 podroid-vsock podroid-ready; doln -sf "/etc/init.d/$svc" "$ROOTFS/etc/runlevels/default/$svc"donediff --git a/build-rootfs/files/etc/init.d/podroid-vsock b/build-rootfs/files/etc/init.d/podroid-vsocknew file mode 100644index 0000000..102cfae--- /dev/null+++ b/build-rootfs/files/etc/init.d/podroid-vsock@@ -0,0 +1,21 @@+#!/sbin/openrc-run+description="Podroid vsock control + port forwarding agent (AVF only)"+command="/usr/local/bin/podroid-vsock-agent"+command_background="yes"+pidfile="/run/podroid-vsock-agent.pid"+output_log="/var/log/podroid-vsock-agent.log"+error_log="/var/log/podroid-vsock-agent.log"++depend() {+ need podroid-bootstrap+ before podroid-ready+}++start_pre() {+ # AVF-only: the QEMU backend never bound an AF_VSOCK socket — skip on QEMU.+ if ! grep -q 'podroid\.tty=ttyS0' /proc/cmdline 2>/dev/null; then+ ewarn "Not an AVF boot — skipping podroid-vsock"+ return 1+ fi+ return 0+}diff --git a/build-rootfs/files/etc/podroid/forwards.conf b/build-rootfs/files/etc/podroid/forwards.confnew file mode 100644index 0000000..c46e8c3--- /dev/null+++ b/build-rootfs/files/etc/podroid/forwards.conf@@ -0,0 +1,19 @@+# Podroid vsock-agent initial forward table.+# Format:+# <vport> tcp <host> <gport> splice vsock:vport ↔ tcp host:gport+# <vport> ctl line-oriented control channel+#+# vport convention: vport == hostPort on the Android side (1:1 mapping). The+# Android EngineHolder also pushes ADD/REMOVE over the ctl channel at runtime;+# agent's handle_add is idempotent on vport so collisions with these initial+# entries are safe.+#+# Minimal entries only — SSH (9922→22 by default) and user-added rules arrive+# via the ctl channel at runtime, so they don't need to live in the seed file.++# Control channel (matches VsockControlChannel.CTL_PORT on Android).+9100 ctl++# X11 viewer — always-on auto-injects in PodroidService.launchPodroid().+5900 tcp 127.0.0.1 5900+4713 tcp 127.0.0.1 4713