projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix error handling for unmounting on the arm64 architecture
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
037e83b
..
879d105
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-251,7
+251,7
@@
cleanup() {
einfo "Removing ${STAGES}" ; rmdir "$STAGES" || eend $?
fi
einfo "Removing ${STAGES}" ; rmdir "$STAGES" || eend $?
fi
- if
[ -n "$ARM_EFI_TARGET" ]
; then
+ if
findmnt "${MNTPOINT}"/boot/efi &>/dev/null
; then
umount "${MNTPOINT}"/boot/efi
fi
umount "${MNTPOINT}"/boot/efi
fi
@@
-1682,7
+1682,7
@@
grub_install() {
umount "${MNTPOINT}"/dev/pts
try_umount 3 "${MNTPOINT}"/dev
umount "${MNTPOINT}"/dev/pts
try_umount 3 "${MNTPOINT}"/dev
- if
[ -n "$VMEFI" ]
; then
+ if
findmnt "${MNTPOINT}"/boot/efi &>/dev/null
; then
umount "${MNTPOINT}"/boot/efi
fi
umount "${MNTPOINT}"/boot/efi
fi
@@
-1695,7
+1695,7
@@
umount_target() {
return 0
fi
return 0
fi
- if
[ -n "${ARM_EFI_TARGET}" ]
; then
+ if
findmnt "${MNTPOINT}"/boot/efi &>/dev/null
; then
umount "${MNTPOINT}"/boot/efi
fi
umount "${MNTPOINT}"/boot/efi
fi