X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=f7b85ebd6c4900e7b9b6fc65472a4fc03265d83e;hp=739fd86d78a0e2d012165ecdc421ca8157e3d6d0;hb=7b07013305bea95e8d6db7239c82be09624a11b8;hpb=f992b13b0e020e75dd4d6592f8d18f0ccafe9e5f

diff --git a/grml-debootstrap b/grml-debootstrap
index 739fd86..f7b85eb 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -8,7 +8,11 @@
 
 # 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.$$"
 
@@ -289,8 +293,9 @@ fi
 
 # cmdline handling {{{
 # source external command line parameter-processing script
-if [ -r ./cmdlineopts.clp ] ; then
-   . ./cmdlineopts.clp
+self_dir="$(dirname "$(which "$0")")"
+if [ -r "${self_dir}"/cmdlineopts.clp ] ; then
+   . "${self_dir}"/cmdlineopts.clp
 elif [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then
    . /usr/share/grml-debootstrap/functions/cmdlineopts.clp
 else
@@ -378,7 +383,7 @@ fi
 
 # 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
 # }}}