aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZev Weiss <zev@bewilderbeest.net>2016-10-01 17:19:38 -0500
committerZev Weiss <zev@bewilderbeest.net>2016-10-27 23:18:55 -0500
commit351394898b07a23a5a857b8fffc9dddb9775fb36 (patch)
tree84a363713275783da845c217144ecdb48f7c7dc8
parent83c9e4e4c15a4f5f9876b927c257ce7307377623 (diff)
downloadvirtme-351394898b07a23a5a857b8fffc9dddb9775fb36.tar.gz
virtme-run: Decompose initargs into discrete commands
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
-rw-r--r--virtme/commands/run.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/virtme/commands/run.py b/virtme/commands/run.py
index 8a2a3d7..6c9d7b5 100644
--- a/virtme/commands/run.py
+++ b/virtme/commands/run.py
@@ -197,7 +197,10 @@ def main():
export_virtfs(qemu, arch, qemuargs, guest_tools_path,
'virtme.guesttools')
- initargs = ['-c', 'mount -t tmpfs run /run;mkdir -p /run/virtme/guesttools;/bin/mount -n -t 9p -o ro,version=9p2000.L,trans=virtio,access=any virtme.guesttools /run/virtme/guesttools;exec /run/virtme/guesttools/virtme-init']
+ initcmds = ['mount -t tmpfs run /run',
+ 'mkdir -p /run/virtme/guesttools',
+ '/bin/mount -n -t 9p -o ro,version=9p2000.L,trans=virtio,access=any virtme.guesttools /run/virtme/guesttools',
+ 'exec /run/virtme/guesttools/virtme-init']
# Map modules
if moddir is not None:
@@ -400,7 +403,7 @@ def main():
# sure that 'init=' appears directly before '--'.
kernelargs.append('init=/bin/sh')
kernelargs.append('--')
- kernelargs.extend(initargs)
+ kernelargs.extend(['-c', ';'.join(initcmds)])
if args.xen is None:
# Load a normal kernel