[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#41560] [PATCH 7/8] system: image: Fix image-with-os.
From: |
Mathieu Othacehe |
Subject: |
[bug#41560] [PATCH 7/8] system: image: Fix image-with-os. |
Date: |
Wed, 27 May 2020 09:24:19 +0200 |
* 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 a706f872a8..97124a4699 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -424,18 +424,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
--
2.26.2
- [bug#41560] [PATCH 0/8] image: Add MBR based boot support., Mathieu Othacehe, 2020/05/27
- [bug#41560] [PATCH 1/8] bootloader: Add 'disk-image-installer'., Mathieu Othacehe, 2020/05/27
- [bug#41560] [PATCH 2/8] bootloader: grub: Do not run grub-install when creating a disk-image., Mathieu Othacehe, 2020/05/27
- [bug#41560] [PATCH 4/8] image: Add bootloader installation support., Mathieu Othacehe, 2020/05/27
- [bug#41560] [PATCH 5/8] system: image: Correct genimage configuration file indentation., Mathieu Othacehe, 2020/05/27
- [bug#41560] [PATCH 3/8] bootloader: grub: Use inheritance to define grub-minimal-bootloader., Mathieu Othacehe, 2020/05/27
- [bug#41560] [PATCH 6/8] image: Use grub-efi to install the EFI bootloader., Mathieu Othacehe, 2020/05/27
- [bug#41560] [PATCH 7/8] system: image: Fix image-with-os.,
Mathieu Othacehe <=
- [bug#41560] [PATCH 8/8] image: Do not use VM to create disk-images., Mathieu Othacehe, 2020/05/27
[bug#41560] [PATCH 1/8] bootloader: Add 'disk-image-installer'., Ludovic Courtès, 2020/05/28
[bug#41560] [PATCH 0/8] image: Add MBR based boot support., Jan Nieuwenhuizen, 2020/05/27
[bug#41560] [PATCH 0/8] image: Add MBR based boot support., Ludovic Courtès, 2020/05/28