Commit 4b4f6bc6 authored by Tails developers's avatar Tails developers

Be more aggressive when tearing down chroots.

This way the chroot browsers will close faster.
parent b584b60c
...@@ -15,10 +15,10 @@ try_cleanup_browser_chroot () { ...@@ -15,10 +15,10 @@ try_cleanup_browser_chroot () {
local chroot="${1}" local chroot="${1}"
local cow="${2}" local cow="${2}"
local user="${3}" local user="${3}"
try_for 10 "pkill -u ${user} 1>/dev/null 2>&1" || \ try_for 10 "pkill -u ${user} 1>/dev/null 2>&1" 0.1 || \
pkill -9 -u ${user} 1>/dev/null 2>&1 pkill -9 -u ${user} 1>/dev/null 2>&1
for mnt in ${chroot}/dev ${chroot}/proc ${chroot} ${cow}; do for mnt in ${chroot}/dev ${chroot}/proc ${chroot} ${cow}; do
try_for 10 "umount ${mnt} 2>/dev/null" try_for 10 "umount ${mnt} 2>/dev/null" 0.1
done done
rmdir ${cow} ${chroot} 2>/dev/null rmdir ${cow} ${chroot} 2>/dev/null
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment