[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/10: system: image: Fix image-with-os.
From: |
guix-commits |
Subject: |
07/10: system: image: Fix image-with-os. |
Date: |
Sat, 23 May 2020 13:37:22 -0400 (EDT) |
mothacehe pushed a commit to branch wip-hurd-vm
in repository guix.
commit ba1376fd93dde416788cfeed5a2588ae05d5a786
Author: Mathieu Othacehe <address@hidden>
AuthorDate: Sat May 23 19:10:07 2020 +0200
system: image: Fix image-with-os.
* gnu/system/image.scm (image-with-os): Do not reorder partitions, as we
want
them to be created according to definition order.
---
gnu/system/image.scm | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 587b4a2..8bebf23 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -423,18 +423,18 @@ to OS. Also set the UUID and the size of the root
partition."
(string=? (file-system-mount-point fs) "/"))
(operating-system-file-systems os)))
- (let*-values (((partitions) (image-partitions base-image))
- ((root-partition other-partitions)
- (srfi-1:partition root-partition? partitions)))
- (image
- (inherit base-image)
- (operating-system os)
- (partitions
- (cons (partition
- (inherit (car root-partition))
- (uuid (file-system-device root-file-system))
- (size (root-size base-image)))
- other-partitions)))))
+ (image
+ (inherit base-image)
+ (operating-system os)
+ (partitions
+ (map (lambda (p)
+ (if (root-partition? p)
+ (partition
+ (inherit p)
+ (uuid (file-system-device root-file-system))
+ (size (root-size base-image)))
+ p))
+ (image-partitions base-image)))))
(define (operating-system-for-image image)
"Return an operating-system based on the one specified in IMAGE, but
- branch wip-hurd-vm updated (cd57c13 -> 7c919d1), guix-commits, 2020/05/23
- 04/10: image: Add bootloader installation support., guix-commits, 2020/05/23
- 01/10: bootloader: Add 'disk-image-installer'., guix-commits, 2020/05/23
- 02/10: bootloader: grub: Do not run grub-install when creating a disk-image., guix-commits, 2020/05/23
- 03/10: bootloader: grub: Use inheritance to define grub-minimal-bootloader., guix-commits, 2020/05/23
- 05/10: system: image: Correct genimage configuration file indentation., guix-commits, 2020/05/23
- 09/10: !squash system: Fix initrd field., guix-commits, 2020/05/23
- 06/10: image: Use grub-efi to install the EFI bootloader., guix-commits, 2020/05/23
- 07/10: system: image: Fix image-with-os.,
guix-commits <=
- 10/10: image: Add Hurd support., guix-commits, 2020/05/23
- 08/10: image: Do not use VM to create disk-images., guix-commits, 2020/05/23