diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2020-05-23 19:10:07 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-05-29 08:43:36 +0200 |
| commit | 749381051d9b43fd4944b44e734c6fd9fced9030 (patch) | |
| tree | 7e748a50cc7d4dc9cf0d0101f6da9795e4b2e818 /gnu/system | |
| parent | 05f37c16a3b159e58ce7343383b44073bd6cac9f (diff) | |
| download | guix-patches-749381051d9b43fd4944b44e734c6fd9fced9030.tar guix-patches-749381051d9b43fd4944b44e734c6fd9fced9030.tar.gz | |
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.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/image.scm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 93b95b307b..53f68c097d 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -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 |