diff options
| author | Andy Lutomirski <luto@kernel.org> | 2016-03-11 11:12:36 -0800 |
|---|---|---|
| committer | Andy Lutomirski <luto@kernel.org> | 2016-03-11 11:12:36 -0800 |
| commit | a449fc204bd23d8a601d55f50c3cba4ff5ed591f (patch) | |
| tree | 391db6248ebb78ec9b3c547c0b45026f2ecf7779 | |
| parent | 4fd64f8e8d4309f07caf8decf035dff52b4513fa (diff) | |
| download | virtme-a449fc204bd23d8a601d55f50c3cba4ff5ed591f.tar.gz | |
virtme-run: Fix -a/--kopt
When I added '--' support, I put user-specified kopts on the wrong
side of the '--'.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
| -rw-r--r-- | virtme/commands/run.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/virtme/commands/run.py b/virtme/commands/run.py index 856608a..51d9c11 100644 --- a/virtme/commands/run.py +++ b/virtme/commands/run.py @@ -392,7 +392,9 @@ def main(): ]) initrdpath = None - # Now that we're done setting up kernelargs, append initargs + # Now that we're done setting up kernelargs, append user-specified args + # and then initargs + kernelargs.extend(args.kopt) kernelargs.append('--') kernelargs.extend(initargs) @@ -401,8 +403,7 @@ def main(): qemuargs.extend(['-kernel', kimg]) if kernelargs: qemuargs.extend(['-append', - ' '.join(quote_karg(a) for a - in (kernelargs + args.kopt))]) + ' '.join(quote_karg(a) for a in kernelargs)]) if initrdpath is not None: qemuargs.extend(['-initrd', initrdpath]) if dtb is not None: |