projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Add grub-common to recommended dependencies for grub-mkimage (issue #61)"
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
89c56f4
..
f218f7c
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-389,7
+389,7
@@
fi
# make sure we have what we need {{{
if [ -n "$VIRTUAL" ] ; then
# make sure we have what we need {{{
if [ -n "$VIRTUAL" ] ; then
- check4progs
grub-mkimage
kpartx mksh parted qemu-img || bailout 1
+ check4progs kpartx mksh parted qemu-img || bailout 1
fi
# }}}
fi
# }}}
@@
-1133,7
+1133,7
@@
finalize_vm() {
umount "${MNTPOINT}"/proc
umount "${MNTPOINT}"/sys
umount "${MNTPOINT}"/dev/pts
umount "${MNTPOINT}"/proc
umount "${MNTPOINT}"/sys
umount "${MNTPOINT}"/dev/pts
-
umount
"${MNTPOINT}"/dev
+
try_umount 3
"${MNTPOINT}"/dev
umount "${MNTPOINT}"
kpartx -d "${ORIG_TARGET}" >/dev/null
}
umount "${MNTPOINT}"
kpartx -d "${ORIG_TARGET}" >/dev/null
}