aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-11-08 15:02:48 +0100
committerLudovic Courtès <ludo@gnu.org>2014-11-08 15:10:42 +0100
commit810568b35f7e5a15f3c4420eee1163fe5274cf2c (patch)
treed0289d86c6e9a9f9a8bb2d54fb6fbafe9b5ebcf3
parentccdca0a09e19a988ce5045afbdc1026f11b70e59 (diff)
downloadguix-810568b35f7e5a15f3c4420eee1163fe5274cf2c.tar.gz
guix-810568b35f7e5a15f3c4420eee1163fe5274cf2c.zip
vm: The 'run-vm' scripts now passes its arguments to QEMU.
* gnu/system/vm.scm (system-qemu-image/shared-store-script): Add "$@" at the end of the script. (common-qemu-options): Remove trailing newline. * doc/guix.texi (Invoking guix system): Document it.
-rw-r--r--doc/guix.texi1
-rw-r--r--gnu/system/vm.scm5
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index bc839ecbbb..1bbb66e9a0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4148,6 +4148,7 @@ This command also installs GRUB on the device specified in
@cindex virtual machine
Build a virtual machine that contain the operating system declared in
@var{file}, and return a script to run that virtual machine (VM).
+Arguments given to the script are passed as is to QEMU.
The VM shares its store with the host system.
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index efe943a7b4..12660d4abc 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -411,7 +411,7 @@ bootloader refers to: OS kernel, initrd, bootloader data, etc."
-serial stdio \
-drive file=" #$image
",if=virtio,cache=writeback,werror=report,readonly \
- -m 256\n"))
+ -m 256"))
(define* (system-qemu-image/shared-store-script os
#:key
@@ -447,7 +447,8 @@ exec " #$qemu "/bin/" #$(qemu-command (%current-system))
-initrd " #$os-drv "/initrd \
-append \"" #$(if graphic? "" "console=ttyS0 ")
"--system=" #$os-drv " --load=" #$os-drv "/boot --root=/dev/vda1\" "))
-#$(common-qemu-options image))
+#$(common-qemu-options image)
+" \"$@\"\n")
port)
(chmod port #o555))))