[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/28: vm: Shared-store script runs that native QEMU and Bash.
From: |
guix-commits |
Subject: |
06/28: vm: Shared-store script runs that native QEMU and Bash. |
Date: |
Sat, 30 May 2020 11:20:13 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 220243a2c638f4d09d2e81d0af0822e2b9478ee2
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed May 27 23:11:14 2020 +0200
vm: Shared-store script runs that native QEMU and Bash.
* gnu/system/vm.scm (system-qemu-image/shared-store-script): Use #+ for
QEMU and BASH.
---
gnu/system/vm.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 05f3986..038cce1 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))))
- branch wip-hurd-vm created (now b73d83f), guix-commits, 2020/05/30
- 03/28: vm: 'qemu-image' uses the native partitioning tools and bootloader., guix-commits, 2020/05/30
- 05/28: vm: <virtual-machine> compiler honors system and target., guix-commits, 2020/05/30
- 08/28: gnu: hurd: Update to upstream Hurd-reserved xattr index., guix-commits, 2020/05/30
- 14/28: bootloader: Extend `<menu-entry>' for multiboot., guix-commits, 2020/05/30
- 01/28: system: 'system-linux-image-file-name' takes an optional parameter., guix-commits, 2020/05/30
- 04/28: vm: 'qemu-image' preserves the cross-compilation target of the OS., guix-commits, 2020/05/30
- 02/28: vm: 'expression->derivation-in-linux-vm' always returns a native build., guix-commits, 2020/05/30
- 07/28: gnu: guile-static: Disable JIT on ARMv7., guix-commits, 2020/05/30
- 09/28: image: Add Hurd support., guix-commits, 2020/05/30
- 06/28: vm: Shared-store script runs that native QEMU and Bash.,
guix-commits <=
- 10/28: linux-boot: Update 'make-hurd-device-nodes'., guix-commits, 2020/05/30
- 11/28: image: Support extra-directives, add hurd-directives., guix-commits, 2020/05/30
- 12/28: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/30
- 15/28: system: Add 'multiboot-modules' field to <boot-parameters>., guix-commits, 2020/05/30
- 18/28: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/30
- 13/28: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/30
- 17/28: system: Use 'hurd' package in label., guix-commits, 2020/05/30
- 16/28: bootloader: grub: Add support for multiboot., guix-commits, 2020/05/30
- 23/28: services: Add `hurd-console-service-type'., guix-commits, 2020/05/30
- 26/28: system: hurd: Remove 'cross-hurd-image' hack., guix-commits, 2020/05/30