snapcraft/hooks/remove: also unmount /var/snap/lxd/shmounts

It may happen that the shmounts setup failed for whatever reason, in which case the fallback path mounts a tmpfs at /var/snap/lxd/shmounts. Make sure to clean it up during remove if needed. Signed-off-by: Maciej Borzecki <[email protected]> (cherry picked from commit 3fdcce0)
masnax · Mar 15, 2024 · 51732a2 · 51732a2
1 parent 92c31e4
commit 51732a2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/snapcraft/hooks/remove b/snapcraft/hooks/remove
@@ -10,7 +10,7 @@ if [ -d /sys/kernel/security/apparmor ]; then
 fi
 
 # Unmount potential LXD paths.
-for path in "${SNAP_COMMON}/ns/shmounts" "${SNAP_COMMON}/ns/mntns" "${SNAP_COMMON}/ns" "${SNAP_COMMON}/var/lib/lxcfs/"; do
+for path in "${SNAP_COMMON}/ns/shmounts" "${SNAP_COMMON}/ns/mntns" "${SNAP_COMMON}/ns" "${SNAP_COMMON}/var/lib/lxcfs/" "${SNAP_COMMON}/shmounts"; do
     nsenter -t 1 -m umount -l "${path}" >/dev/null 2>&1 || true
 done