X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=overlay-boot;h=899d53ba25f3f9310041462df7d84ce06d9a3307;hb=1c9c4ac02c9718b20f8d3549bb15bb9c7c82ab23;hp=fc4b8b428e0d7eb1ffc2665b4c3aca5071f550f9;hpb=999f45597a2b2461d43d05b3a4726c29d2eed0ac;p=rrq%2Foverlay-boot.git

diff --git a/overlay-boot b/overlay-boot
index fc4b8b4..899d53b 100755
--- a/overlay-boot
+++ b/overlay-boot
@@ -31,7 +31,20 @@ exithandler() {
 }
 trap "exithandler" 0
 
-CMD="unshare -fp --mount-proc -i -u ip netns exec $NAME chroot $LIVE /bin/sh"
-echo "$CMD"
-env CONFIG="$CONFIG" $INIT | $CMD
-echo "EXITED $CMD"
+# This process has an unshared mount namespace, so we unmount almost
+# everything before chroot. Exceptions are: $LIVE and anything mounted
+# below that, "/run/netns/$NAME" and its parent paths (incidentally
+# including "/" as well) and "/proc".
+sort -rk2,2 < /proc/mounts | while read D P A2 ; do
+    beginswith "$P" "$LIVE" && continue
+    beginswith "$P" "$(realpath $LIVE)" && continue
+    beginswith "/run/netns/$NAME" "$P" && continue
+    [ "$P" = /proc ] && continue
+    umount "$P"
+done
+
+echo "Starting $NAME"
+env CONFIG="$CONFIG" $INIT | \
+    unshare -fp --mount-proc -i -u \
+	    ip netns exec $NAME chroot $LIVE /bin/sh
+echo "Exited $NAME"