X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-debootstrap;h=bac2cd51fab2e919a36ea064630b6549c53c29da;hb=6f8ba91b9f1b033abe9cbdf2c6349f97e5ae0732;hp=7f367eca386a9037b5c61866f1a41c85302bbd66;hpb=ddbb875446e0efa8cd310ed96270713615db1a46;p=grml-debootstrap.git

diff --git a/grml-debootstrap b/grml-debootstrap
index 7f367ec..bac2cd5 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -845,7 +845,7 @@ if [ -n "$ISO" ] ; then
       file*) # do nothing
       ;;
       *)
-      ISO=file:$1
+      ISO=file:$ISO
       ;;
    esac
 fi
@@ -945,7 +945,7 @@ prepare_vm() {
 
   # if dm-mod isn't available then kpartx will fail with
   # "Is device-mapper driver missing from kernel? [...]"
-  if ! kpartx -av $TARGET >/dev/null 2>&1 ; then
+  if ! kpartx -av $TARGET >/dev/null 2>&1 || ! grep -q device-mapper /proc/misc >/dev/null 2>&1 ; then
     einfo "Device-mapper not ready yet, trying to load dm-mod module."
     modprobe dm-mod ; eend $?
   fi