06/35: vm: Shared-store script runs that native QEMU and Bash.

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit 2713d3c763b5d7fe5e7719ca4bf45a7e0070aaa3
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))))