diff options
author | David Craven <david@craven.ch> | 2017-02-14 16:28:32 +0100 |
---|---|---|
committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-03-01 00:15:31 +0100 |
commit | 26a076ed693167dd4d501a880933a75da894a57f (patch) | |
tree | 7f8b4a89025f11246d592c68ddd92f9989aebd4c /gnu/system | |
parent | 43fe431cce107bd311a68dea59ac0f672ac13615 (diff) | |
download | patches-26a076ed693167dd4d501a880933a75da894a57f.tar patches-26a076ed693167dd4d501a880933a75da894a57f.tar.gz |
vm: Improve readability of run-vm.sh generation.
* gnu/system/vm.scm (common-qemu-options,
system-qemu-image/shared-store-script): Improve readability.
Diffstat (limited to 'gnu/system')
-rw-r--r-- | gnu/system/vm.scm | 69 |
1 files changed, 38 insertions, 31 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index a7203d1690..103af37c9a 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -434,25 +434,26 @@ bootloader refers to: OS kernel, initrd, bootloader data, etc." (define* (common-qemu-options image shared-fs) "Return the a string-value gexp with the common QEMU options to boot IMAGE, with '-virtfs' options for the host file systems listed in SHARED-FS." + (define (virtfs-option fs) - #~(string-append "-virtfs local,path=\"" #$fs - "\",security_model=none,mount_tag=\"" - #$(file-system->mount-tag fs) - "\" ")) + #~(format #f "-virtfs local,path=~s,security_model=none,mount_tag=~s" + #$fs #$(file-system->mount-tag fs))) - #~(string-append - ;; Only enable kvm if we see /dev/kvm exists. + #~(;; Only enable kvm if we see /dev/kvm exists. ;; This allows users without hardware virtualization to still use these ;; commands. - #$(if (file-exists? "/dev/kvm") - " -enable-kvm " - "") - " -no-reboot -net nic,model=virtio \ - " #$@(map virtfs-option shared-fs) " \ - -vga std \ - -drive file=" #$image - ",if=virtio,cache=writeback,werror=report,readonly \ - -m 256")) + #$@(if (file-exists? "/dev/kvm") + '("-enable-kvm") + '()) + + "-no-reboot" + "-net nic,model=virtio" + + #$@(map virtfs-option shared-fs) + "-vga std" + (format #f "-drive file=~a,if=virtio,cache=writeback,werror=report,readonly" + #$image) + "-m 256")) (define* (system-qemu-image/shared-store-script os #:key @@ -479,25 +480,31 @@ it is mostly useful when FULL-BOOT? is true." os #:full-boot? full-boot? #:disk-image-size disk-image-size))) + (define kernel-arguments + #~(list "--root=/dev/vda1" + (string-append "--system=" #$os-drv) + (string-append "--load=" #$os-drv "/boot") + #$@(if graphic? #~() #~("console=ttyS0")) + #+@(operating-system-kernel-arguments os))) + + (define qemu-exec + #~(list (string-append #$qemu "/bin/" #$(qemu-command (%current-system))) + #$@(if full-boot? + #~() + #~("-kernel" #$(operating-system-kernel-file os) + "-initrd" #$(file-append os-drv "/initrd") + (format #f "-append ~s" + (string-join #$kernel-arguments " ")))) + #$@(common-qemu-options image + (map file-system-mapping-source + (cons %store-mapping mappings))))) + (define builder #~(call-with-output-file #$output (lambda (port) - (display - (string-append "#!" #$bash "/bin/sh -exec " #$qemu "/bin/" #$(qemu-command (%current-system)) - -#$@(if full-boot? - #~() - #~(" -kernel " #$(operating-system-kernel-file os) " \ - -initrd " #$os-drv "/initrd \ - -append \"" #$(if graphic? "" "console=ttyS0 ") - "--system=" #$os-drv " --load=" #$os-drv "/boot --root=/dev/vda1 " - (string-join (list #+@(operating-system-kernel-arguments os))) "\" ")) -#$(common-qemu-options image - (map file-system-mapping-source - (cons %store-mapping mappings))) -" \"$@\"\n") - port) + (format port "#!~a~% exec ~a \"$@\"~%" + #$(file-append bash "/bin/sh") + (string-join #$qemu-exec " ")) (chmod port #o555)))) (gexp->derivation "run-vm.sh" builder))) |