enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

armbian-next: still fighting tee leaking under duress, turns out I _hadn't_ really won

Browse Source 
- last resort, use lazy umount.
- include `lsof` in hostdeps, useful to debug these situations
This commit is contained in:
Ricardo Pardini 2023-01-18 17:24:19 +01:00
parent e344bc1fc7
commit c1100fa461
No known key found for this signature in database
GPG Key ID: 3D38CA12A66C5D02
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/functions/host/prepare-host.sh
View File

@ -245,7 +245,7 @@ function adaptative_prepare_host_dependencies() {
kmod # this causes initramfs rebuild, but is usually pre-installed, so no harm done unless it's an upgrade
libbison-dev libelf-dev libfdt-dev libfile-fcntllock-perl libmpc-dev libfl-dev liblz4-tool
libncurses-dev libssl-dev libusb-1.0-0-dev
linux-base locales
linux-base locales lsof
ncurses-base ncurses-term # for `make menuconfig`
ntpdate
patchutils pkg-config pv

17
lib/functions/host/tmpfs-utils.sh
View File

@ -71,11 +71,24 @@ function cleanup_tmpfs_for() {
if [[ "${umount_tmpfs}" == "umount_tmpfs" ]]; then
display_alert "cleanup_tmpfs_for: umount tmpfs" "${tmpfs_name}" "cleanup"
cd "${SRC}" || echo "cleanup_tmpfs_for: cd failed to ${SRC}" >&2 # avoid cwd in use error
umount "${tmpfs_path}" || {
display_alert "cleanup_tmpfs_for: umount failed" "${tmpfs_name} tmpfs umount failed" "err"
sync # let disk coalesce
umount "${tmpfs_path}" &> /dev/null || {
display_alert "cleanup_tmpfs_for: umount failed" "${tmpfs_name} tmpfs umount failed, will try lazy" "cleanup"
# Do a lazy umount... last-resort...
sync
umount -l "${tmpfs_path}" &> /dev/null || display_alert "cleanup_tmpfs_for: lazy umount failed" "${tmpfs_name} tmpfs lazy umount also failed" "cleanup"
sync
}
# Check if the tmpfs is still mounted after all that trying, log error, show debug, and give up with error
mountpoint -q "${tmpfs_path}" && {
display_alert "cleanup_tmpfs_for: umount failed" "${tmpfs_name} tmpfs still mounted after retries/lazy umount" "err"
# Show last-resort what's in there / what's using it to stderr
ls -la "${tmpfs_path}" >&2 || echo "cleanup_tmpfs_for: ls failed" >&2
lsof "${tmpfs_path}" >&2 || echo "cleanup_tmpfs_for: lsof dir failed" >&2
return 1 # sorry, we tried.
} || {
display_alert "cleanup_tmpfs_for: umount success" "${tmpfs_name}" "cleanup"
}
else
display_alert "cleanup_tmpfs_for: not umounting tmpfs" "${tmpfs_name}" "cleanup"