projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/pr/255'
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
bac28b0
..
879d105
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-251,8
+251,8
@@
cleanup() {
einfo "Removing ${STAGES}" ; rmdir "$STAGES" || eend $?
fi
einfo "Removing ${STAGES}" ; rmdir "$STAGES" || eend $?
fi
- if
[ -n "$ARM_EFI_TARGET" ]
; then
- umount "${MNTPOINT}
/boot/efi" >/dev/null 2>&1
+ if
findmnt "${MNTPOINT}"/boot/efi &>/dev/null
; then
+ umount "${MNTPOINT}
"/boot/efi
fi
# Remove temporary mountpoint again
fi
# Remove temporary mountpoint again
@@
-1451,7
+1451,7
@@
prepare_vm() {
fi
# make sure loop module is present and a usable loop device exists
fi
# make sure loop module is present and a usable loop device exists
- modprobe
-q loop
+ modprobe
loop || true
if ! losetup -f >/dev/null 2>&1; then
eerror "Error finding usable loop device"
bailout 1
if ! losetup -f >/dev/null 2>&1; then
eerror "Error finding usable loop device"
bailout 1
@@
-1459,7
+1459,7
@@
prepare_vm() {
# if dm-mod isn't available then kpartx will fail with
# "Is device-mapper driver missing from kernel? [...]"
# if dm-mod isn't available then kpartx will fail with
# "Is device-mapper driver missing from kernel? [...]"
- modprobe
-q dm-mod
+ modprobe
dm-mod || true
if ! grep -q 'device-mapper' /proc/misc >/dev/null 2>&1 ; then
eerror "Device-mapper support missing in kernel."
bailout 1
if ! grep -q 'device-mapper' /proc/misc >/dev/null 2>&1 ; then
eerror "Device-mapper support missing in kernel."
bailout 1
@@
-1548,8
+1548,8
@@
grub_install() {
fi
if [ -n "${ARM_EFI_TARGET}" ]; then
fi
if [ -n "${ARM_EFI_TARGET}" ]; then
- mkdir -p "${MNTPOINT}
/boot/efi"
- if ! mount "${ARM_EFI_TARGET}" "${MNTPOINT}
/boot/efi"
; then
+ mkdir -p "${MNTPOINT}
"/boot/efi
+ if ! mount "${ARM_EFI_TARGET}" "${MNTPOINT}
"/boot/efi
; then
eerror "Error: Mounting ${ARM_EFI_TARGET} failed, can not continue."
bailout 1
fi
eerror "Error: Mounting ${ARM_EFI_TARGET} failed, can not continue."
bailout 1
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,8
+1695,8
@@
umount_target() {
return 0
fi
return 0
fi
- if
[ -n "${ARM_EFI_TARGET}" ]
; then
- umount "${MNTPOINT}
/boot/efi"
+ if
findmnt "${MNTPOINT}"/boot/efi &>/dev/null
; then
+ umount "${MNTPOINT}
"/boot/efi
fi
umount "${MNTPOINT}"
fi
umount "${MNTPOINT}"