diff options
author | Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br> | 2015-10-16 08:58:30 -0300 |
---|---|---|
committer | Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br> | 2015-10-16 08:58:30 -0300 |
commit | 0b881b32dc1674e0c5ef1a7eb862471ee1994a0d (patch) | |
tree | d816e669cb4199e41e716c3b493666adae799d08 /debian | |
parent | 6c1452e6bc2ac20a14bd882fbb334c9042e4f708 (diff) | |
download | lightdm-0b881b32dc1674e0c5ef1a7eb862471ee1994a0d.tar.gz |
Handle /run/media/guest-XXXXXX cleanup as well on guest account removal.
Diffstat (limited to 'debian')
-rw-r--r-- | debian/guest-account.sh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/debian/guest-account.sh b/debian/guest-account.sh index 8380bd3a..1815d972 100644 --- a/debian/guest-account.sh +++ b/debian/guest-account.sh @@ -160,14 +160,16 @@ remove_account () # remove leftovers in /tmp find /tmp -mindepth 1 -maxdepth 1 -uid ${GUEST_UID} -print0 | xargs -0 rm -rf || true - # remove possible /media/guest-XXXXXX folder - if [ -d /media/${GUEST_USER} ]; then - for dir in $(find /media/${GUEST_USER} -mindepth 1 -maxdepth 1); do - umount ${dir} || true - done - - rmdir /media/${GUEST_USER} || true - fi + # remove possible {/run,}/media/guest-XXXXXX folder + for media_dir in /run/media/${GUEST_USER} /media/${GUEST_USER}; do + if [ -d ${media_dir} ]; then + for dir in $(find ${media_dir} -mindepth 1 -maxdepth 1); do + umount ${dir} || true + done + + rmdir ${media_dir} || true + fi + done userdel ${GUEST_USER} } |