summaryrefslogtreecommitdiff
path: root/gnu/system/image.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-01-13 23:39:52 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-01-13 23:45:53 -0500
commit01f0707207741ce2a5d7509a175464799b08aea6 (patch)
tree08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/system/image.scm
parent734bcf13139119daf8685f93b056c3422dbfa264 (diff)
parent6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff)
downloadguix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar
guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar.gz
Merge branch 'staging' into 'core-updates'.
Conflicts: gnu/local.mk gnu/packages/cmake.scm gnu/packages/curl.scm gnu/packages/gl.scm gnu/packages/glib.scm gnu/packages/guile.scm gnu/packages/node.scm gnu/packages/openldap.scm gnu/packages/package-management.scm gnu/packages/python-xyz.scm gnu/packages/python.scm gnu/packages/tls.scm gnu/packages/vpn.scm gnu/packages/xorg.scm
Diffstat (limited to 'gnu/system/image.scm')
-rw-r--r--gnu/system/image.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 4972d9067b..67930750d5 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -560,7 +560,9 @@ to OS. Also set the UUID and the size of the root partition."
"Return an operating-system based on the one specified in IMAGE, but
suitable for image creation. Assign an UUID to the root file-system, so that
it can be used for bootloading."
- (define volatile-root? (image-volatile-root? image))
+ (define volatile-root? (if (eq? (image-format image) 'iso9660)
+ #t
+ (image-volatile-root? image)))
(define (root-uuid os)
;; UUID of the root file system, computed in a deterministic fashion.