ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

vm: The 'run-vm' scripts now passes its arguments to QEMU.

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2014-11-08 15:02:48 +01:00
parent ccdca0a09e
commit 810568b35f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/guix.texi
View file

@ -4148,6 +4148,7 @@ This command also installs GRUB on the device specified in
@cindex virtual machine @cindex virtual machine
Build a virtual machine that contain the operating system declared in Build a virtual machine that contain the operating system declared in
@var{file}, and return a script to run that virtual machine (VM). @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. The VM shares its store with the host system.

5
gnu/system/vm.scm
View file

@ -411,7 +411,7 @@ (define* (common-qemu-options image)
-serial stdio \ -serial stdio \
-drive file=" #$image -drive file=" #$image
",if=virtio,cache=writeback,werror=report,readonly \ ",if=virtio,cache=writeback,werror=report,readonly \
-m 256\n")) -m 256"))
(define* (system-qemu-image/shared-store-script os (define* (system-qemu-image/shared-store-script os
#:key #:key
@ -447,7 +447,8 @@ (define builder
-initrd " #$os-drv "/initrd \ -initrd " #$os-drv "/initrd \
-append \"" #$(if graphic? "" "console=ttyS0 ") -append \"" #$(if graphic? "" "console=ttyS0 ")
"--system=" #$os-drv " --load=" #$os-drv "/boot --root=/dev/vda1\" ")) "--system=" #$os-drv " --load=" #$os-drv "/boot --root=/dev/vda1\" "))
#$(common-qemu-options image)) #$(common-qemu-options image)
" \"$@\"\n")
port) port)
(chmod port #o555)))) (chmod port #o555))))