Skip to content

A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.

feat(vm): plain rootfs overlay + one-time legacy normalization for seamless updates

ExTv5f69471ae955
diff --git a/init-podroid b/init-podroid
index d77285e..de6038f 100755
--- a/init-podroid
+++ b/init-podroid
@@ -45,11 +45,25 @@ echo "Mounting system..." > /dev/console
mount -t squashfs -o ro /dev/vdb /mnt/lower \
|| { echo "FATAL: squashfs (/dev/vdb) mount failed" > /dev/console; ls -l /dev/vd* > /dev/console 2>&1; exec sh; }
-mkdir -p /mnt/persist/upper /mnt/persist/work \
+mkdir -p /mnt/persist/upper /mnt/persist/work /mnt/persist/.podroid \
|| { echo "FATAL: mkdir overlay upper/work failed" > /dev/console; exec sh; }
+
+# One-time legacy-overlay normalization: older versions mounted the overlay with
+# metacopy=on,redirect_dir=on,index=on, which bind the upper to the OLD lower.
+# We now use a PLAIN overlay (below), so before stacking we strip that legacy
+# metadata from the upper using the normalizer shipped in the (new) squashfs.
+# No-op on a fresh or already-normalized upper. Guarded so it runs at most once.
+if [ ! -f /mnt/persist/.podroid/normalized ]; then
+ echo "Normalizing overlay (one-time)..." > /dev/console
+ /mnt/lower/usr/local/bin/podroid-overlay-normalize /mnt/persist/upper /mnt/persist/work > /dev/console 2>&1 || true
+ : > /mnt/persist/.podroid/normalized
+fi
+
echo "Stacking overlay..." > /dev/console
+# PLAIN overlay (no metacopy/redirect_dir/index): tolerates a swapped lower, so a
+# new release's squashfs goes live on the next boot with the upper preserved.
mount -t overlay overlay \
- -o lowerdir=/mnt/lower,upperdir=/mnt/persist/upper,workdir=/mnt/persist/work,metacopy=on,redirect_dir=on,index=on \
+ -o lowerdir=/mnt/lower,upperdir=/mnt/persist/upper,workdir=/mnt/persist/work \
/mnt/overlay \
|| { echo "FATAL: overlay mount failed" > /dev/console; ls -l /dev/vd* > /dev/console 2>&1; exec sh; }