Merge pull request #41 from zevweiss/misc-fixes

Miscellaneous small fixes
diff --git a/virtme/commands/run.py b/virtme/commands/run.py
index c40e225..ae1b4fa 100644
--- a/virtme/commands/run.py
+++ b/virtme/commands/run.py
@@ -306,7 +306,7 @@
             name,fn = namefile
             if '=' in fn or ',' in fn:
                 arg_fail("--disk filenames cannot contain '=' or ','")
-            if '=' in fn or ',' in name:
+            if '=' in name or ',' in name:
                 arg_fail("--disk device names cannot contain '=' or ','")
             driveid = 'disk%d' % i
             qemuargs.extend(['-drive', 'if=none,id=%s,file=%s' % (driveid, fn),
diff --git a/virtme/mkinitramfs.py b/virtme/mkinitramfs.py
index 51f6fc6..dde504d 100644
--- a/virtme/mkinitramfs.py
+++ b/virtme/mkinitramfs.py
@@ -41,6 +41,7 @@
     cw.write_file(name=b'bin/modprobe', body=b'\n'.join([
         b'#!/bin/sh',
         b'echo "virtme: initramfs does not have module $3" >/dev/console',
+        b'exit 1',
     ]), mode=0o755)
 
 _LOGFUNC = """log() {