summary refs log tree commit diff
path: root/gnu/system
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 /gnu/system
parentccdca0a09e19a988ce5045afbdc1026f11b70e59 (diff)
downloadguix-810568b35f7e5a15f3c4420eee1163fe5274cf2c.tar.gz
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.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/vm.scm5
1 files changed, 3 insertions, 2 deletions
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))))