diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-05-27 23:11:14 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-06-06 23:28:49 +0200 |
| commit | e768e4e97fff4615da01245437ee91f27adb0c9c (patch) | |
| tree | 875f5ae97d494f1e8db520143d202e61d4a609b8 | |
| parent | 60f759f06d3a33f9284233200a2c732ed8716ef7 (diff) | |
| download | guix-e768e4e97fff4615da01245437ee91f27adb0c9c.tar.gz guix-e768e4e97fff4615da01245437ee91f27adb0c9c.zip | |
vm: Shared-store script runs the native QEMU and Bash.
* gnu/system/vm.scm (system-qemu-image/shared-store-script): Use #+ for
QEMU and BASH.
| -rw-r--r-- | gnu/system/vm.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 05f3986aca..038cce19b6 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -862,7 +862,8 @@ it is mostly useful when FULL-BOOT? is true." #+@(operating-system-kernel-arguments os "/dev/vda1"))) (define qemu-exec - #~(list (string-append #$qemu "/bin/" #$(qemu-command (%current-system))) + #~(list #+(file-append qemu "/bin/" + (qemu-command (or target system))) #$@(if full-boot? #~() #~("-kernel" #$(operating-system-kernel-file os) @@ -879,7 +880,7 @@ it is mostly useful when FULL-BOOT? is true." #~(call-with-output-file #$output (lambda (port) (format port "#!~a~% exec ~a \"$@\"~%" - #$(file-append bash "/bin/sh") + #+(file-append bash "/bin/sh") (string-join #$qemu-exec " ")) (chmod port #o555)))) |