[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
35/36: system: vm: Add defaults for the Hurd.
From: |
guix-commits |
Subject: |
35/36: system: vm: Add defaults for the Hurd. |
Date: |
Mon, 27 Apr 2020 06:19:53 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit aec33abc318250c8beef50b301a53900fb9d54b1
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 | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 1d5ee39..0df7938 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -49,6 +49,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)
@@ -361,13 +362,14 @@ INPUTS is a list of inputs (as for packages)."
(define* (qemu-image #:key
(name "qemu-image")
(system (%current-system))
- (target (%current-target-system))
+ (target (if (hurd-target?) #f (%current-target-system)))
(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
@@ -494,7 +496,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
@@ -506,7 +508,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
@@ -774,7 +776,7 @@ substitutable."
(define* (system-qemu-image os
#:key
- (file-system-type "ext4")
+ (file-system-type (if (hurd-target?) "exit2"
"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."
- 25/36: system: hurd: Add guix., (continued)
- 25/36: system: hurd: Add guix., guix-commits, 2020/04/27
- 28/36: services: Add hurd-file-systems-service-type., guix-commits, 2020/04/27
- 29/36: services: hurd: Move hurd-default-essential-services., guix-commits, 2020/04/27
- 32/36: system: hurd: Add hurd-grub-configuration-file., guix-commits, 2020/04/27
- 33/36: system: hurd: Add hurd-grub-minimal-bootloader., guix-commits, 2020/04/27
- 23/36: system: hurd: Create system profile for guix development., guix-commits, 2020/04/27
- 30/36: system: hurd: Export system variables., guix-commits, 2020/04/27
- 27/36: services: hurd: Move hurd-etc-sevcices., guix-commits, 2020/04/27
- 09/36: gnu: Add libtirpc/hurd., guix-commits, 2020/04/27
- 31/36: services: hurd: Use hurd-file-systems-service., guix-commits, 2020/04/27
- 35/36: system: vm: Add defaults for the Hurd.,
guix-commits <=
- 24/36: system: gnu: Add %bootstrap-{gcc, binutils, glibc} for devel profile., guix-commits, 2020/04/27
- 34/36: system: Add hurd-operating-system-directory-base-entries., guix-commits, 2020/04/27
- 36/36: DRAFT system: examples: Add bare-hurd.tmpl., guix-commits, 2020/04/27
- 26/36: system: hurd: Add the guix service., guix-commits, 2020/04/27