projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed version reported when run from Git (issue #55)
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
a97f5ec
..
2a27c46
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-8,7
+8,11
@@
# variables {{{
PN="$(basename "$0")"
# variables {{{
PN="$(basename "$0")"
-VERSION="$(dpkg-query --show --showformat='${Version}' "$PN")"
+if [[ -d "$(dirname "$(which "$0")")"/.git ]]; then
+ VERSION="$(git describe | sed 's|^v||')"
+else
+ VERSION="$(dpkg-query --show --showformat='${Version}' "$PN")"
+fi
VERSION="${VERSION:-unknown}"
MNTPOINT="/mnt/debootstrap.$$"
VERSION="${VERSION:-unknown}"
MNTPOINT="/mnt/debootstrap.$$"
@@
-205,8
+209,11
@@
cleanup() {
if [ -n "$MNTPOINT" ] ; then
if grep -q "$MNTPOINT" /proc/mounts ; then
# make sure nothing is left inside chroot so we can unmount it
if [ -n "$MNTPOINT" ] ; then
if grep -q "$MNTPOINT" /proc/mounts ; then
# make sure nothing is left inside chroot so we can unmount it
- [ -x "$MNTPOINT"/etc/init.d/ssh ] && "$MNTPOINT"/etc/init.d/ssh stop
- [ -x "$MNTPOINT"/etc/init.d/mdadm ] && "$MNTPOINT"/etc/init.d/mdadm stop
+ for service in ssh mdadm ; do
+ if [ -x "${MNTPOINT}/etc/init.d/${service}" ] ; then
+ chroot "$MNTPOINT" "/etc/init.d/${service}" stop
+ fi
+ done
[ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount -a >/dev/null 2>&1
[ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount -a >/dev/null 2>&1
@@
-375,7
+382,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 kpartx mksh parted qemu-img || bailout 1
+ check4progs
grub-mkimage
kpartx mksh parted qemu-img || bailout 1
fi
# }}}
fi
# }}}