me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Mathieu Othacehe 2020-05-23 19:10:07 +02:00
parent 05f37c16a3
commit 749381051d
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/system/image.scm
View File

@ -420,18 +420,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