03/12: system: vm: Add defaults for the Hurd.

[guix-commits]

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

commit bf798135b5d6db52247b636ac659c667d502c52f
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sat Apr 25 23:13:09 2020 +0200

    system: vm: Add defaults for the Hurd.
    
    * gnu/system/vm.scm (qemu-image): Add default parameter values for the Hurd,
    and avoid grub-efi.
    (system-qemu-image): When building for the Hurd, use appropriete
    file-system-type.
---
 gnu/system/vm.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 18f783d..0b6d787 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -50,6 +50,7 @@
   #:use-module (gnu packages virtualization)
   #:use-module (gnu packages disk)
   #:use-module (gnu packages zile)
+  #:use-module (gnu packages hurd)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages admin)
 
@@ -366,9 +367,10 @@ INPUTS is a list of inputs (as for packages)."
                      (qemu qemu-minimal)
                      (disk-image-size 'guess)
                      (disk-image-format "qcow2")
-                     (file-system-type "ext4")
-                     (file-system-options '())
-                     (device-nodes 'linux)
+                     (file-system-type (if (hurd-target?) "ext2" "ext4"))
+                     (file-system-options
+                      (if (hurd-target?) '("-o" "hurd") '()))
+                     (device-nodes (if (hurd-target?) 'hurd 'linux))
                      (extra-directives '())
                      file-system-label
                      file-system-uuid
@@ -495,7 +497,7 @@ system that is passed to 'populate-root-file-system'."
                       ;; FIXME: ‘target-arm?’ may be not operate on the right
                       ;; system/target values.  Rewrite using ‘let-system’ when
                       ;; available.
-                      (if #$(target-arm?)
+                      (if #$(or (hurd-target?) (target-arm?))
                           '()
                           (list (partition
                                  ;; The standalone grub image is about 10MiB, 
but
@@ -507,7 +509,7 @@ system that is passed to 'populate-root-file-system'."
                                  ;; on file system size (16 in this case).
                                  (file-system "vfat")
                                  (flags '(esp)))))))
-                    (grub-efi #$(and (not (target-arm?)) grub-efi)))
+                    (grub-efi #$(and (not (hurd-target?)) (not (target-arm?)) 
grub-efi)))
                (initialize-hard-disk "/dev/vda"
                                      #:partitions partitions
                                      #:grub-efi grub-efi
@@ -775,7 +777,7 @@ substitutable."
 
 (define* (system-qemu-image os
                             #:key
-                            (file-system-type "ext4")
+                            (file-system-type (if (hurd-target?) "ext2" 
"ext4"))
                             (disk-image-size (* 900 (expt 2 20))))
   "Return the derivation of a freestanding QEMU image of DISK-IMAGE-SIZE bytes
 of the GNU system as described by OS."