diff options
| author | Andrew Lutomirski <luto@kernel.org> | 2019-09-27 09:38:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-27 09:38:02 -0700 |
| commit | efedddfdaae95579238d303245e3601239d1557c (patch) | |
| tree | 4bf3ee58a708828ddb9eb07e3012515c18c8e527 | |
| parent | 37e91bf6509b4e607707a68ee698c3b388a8f6db (diff) | |
| parent | eacb07a6b34ef85b9b28ed660144be0f114450b0 (diff) | |
| download | virtme-efedddfdaae95579238d303245e3601239d1557c.tar.gz | |
Merge pull request #41 from zevweiss/misc-fixes
Miscellaneous small fixes
| -rw-r--r-- | virtme/commands/run.py | 2 | ||||
| -rw-r--r-- | virtme/mkinitramfs.py | 1 |
2 files changed, 2 insertions, 1 deletions
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 @@ def main(): 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 @@ def install_modprobe(cw): 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() { |