diff options
| author | Zev Weiss <zev@bewilderbeest.net> | 2016-10-27 23:15:07 -0500 |
|---|---|---|
| committer | Zev Weiss <zev@bewilderbeest.net> | 2016-10-27 23:19:00 -0500 |
| commit | 685ed24de37f94ae7e9372f754ced5699105f2ac (patch) | |
| tree | 596293305b2de58f6ece1a371f80546e66c9bcc5 | |
| parent | 351394898b07a23a5a857b8fffc9dddb9775fb36 (diff) | |
| download | virtme-685ed24de37f94ae7e9372f754ced5699105f2ac.tar.gz | |
virtme-run: Don't mount second /run tmpfs with initramfs
The _INIT script in mkinitramfs.py mounts a tmpfs on /run; mounting
another one over it hides /run/virtme, breaking --script-sh and
--script-exec (which execute a script from /run/virtme/data).
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
| -rw-r--r-- | virtme/commands/run.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/virtme/commands/run.py b/virtme/commands/run.py index 6c9d7b5..2535d13 100644 --- a/virtme/commands/run.py +++ b/virtme/commands/run.py @@ -197,8 +197,7 @@ def main(): export_virtfs(qemu, arch, qemuargs, guest_tools_path, 'virtme.guesttools') - initcmds = ['mount -t tmpfs run /run', - 'mkdir -p /run/virtme/guesttools', + initcmds = ['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'] @@ -392,6 +391,7 @@ def main(): 'rw' if args.rw else 'ro', ]) initrdpath = None + initcmds.insert(0, 'mount -t tmpfs run /run') # Now that we're done setting up kernelargs, append user-specified args # and then initargs |