In the ideal case, these will be cleaned up when the VM running them exits, but there's always the possibility that there are some left over, in which case mount time is the perfect time to clean up, when we can be reasonably sure nothing else is still accessing them. Signed-off-by: Alyssa Ross <hi@alyssa.is> --- host/rootfs/image/usr/bin/mount-userdata | 36 ++++++++++++++++-------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/host/rootfs/image/usr/bin/mount-userdata b/host/rootfs/image/usr/bin/mount-userdata index 6e4ac47d..2e130b83 100755 --- a/host/rootfs/image/usr/bin/mount-userdata +++ b/host/rootfs/image/usr/bin/mount-userdata @@ -7,18 +7,32 @@ backtick -D "" uuid { blkid -o value -s UUID -- $1 } -multisubstitute { - importas -Siu 0 - importas -Siu 1 - importas -Siu uuid -} - -case $uuid { - "" { - fdmove -c 1 2 - printf "%s: '%s' does not have a UUID\n" $0 $1 +if { + multisubstitute { + importas -Siu 0 + importas -Siu 1 + importas -Siu uuid } + + case $uuid { + "" { + fdmove -c 1 2 + printf "%s: '%s' does not have a UUID\n" $0 $1 + } + } + + mount -m -t btrfs -o nosuid,nodev,noexec,nosymfollow -- $1 /media/${uuid} +} + +importas -Siu uuid + +if { + if -t { test -d /media/${uuid}/Spectrum/data/spectrum/storage } + find /media/${uuid}/Spectrum/data/spectrum/storage + -mindepth 1 + -maxdepth 1 + -name tmp.* + -exec rm -rf -- {} ; } -if { mount -m -t btrfs -o nosuid,nodev,noexec,nosymfollow -- $1 /media/${uuid} } printf "%s\n" /media/${uuid} -- 2.51.0