[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/21: system: vm: Add defaults for the Hurd.
From: |
guix-commits |
Subject: |
03/21: system: vm: Add defaults for the Hurd. |
Date: |
Sun, 10 May 2020 10:07:36 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit e40ff9ffe07655977a9b1c85e2354efdbcfc7427
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 eba3376..48cc3d2 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)
@@ -277,9 +278,10 @@ substitutable."
(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
@@ -406,7 +408,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
@@ -418,7 +420,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
@@ -615,7 +617,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."
- branch wip-hurd-vm created (now aacc07d), guix-commits, 2020/05/10
- 02/21: system: vm: Fix for cross-build to the Hurd., guix-commits, 2020/05/10
- 03/21: system: vm: Add defaults for the Hurd.,
guix-commits <=
- 06/21: bootleader: Add `<hurd-menu-entry>'., guix-commits, 2020/05/10
- 01/21: syscalls: Adjust 'sockaddr-in', 'sockaddr-in6' structs for the Hurd., guix-commits, 2020/05/10
- 04/21: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/10
- 05/21: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/10
- 07/21: system: Add 'hurd' field to <boot-parameters>., guix-commits, 2020/05/10
- 12/21: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/10
- 14/21: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/10
- 08/21: bootloader: grub: Add support for '<hurd-menu-entry>'., guix-commits, 2020/05/10
- 10/21: system: Use 'hurd' package in label., guix-commits, 2020/05/10
- 13/21: system: Add `hurd-activation'., guix-commits, 2020/05/10