summaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2017-07-03 19:57:50 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2017-07-07 18:04:31 +0200
commitacc0f6bb5885e661a406a367a9543debc455221a (patch)
treee12c9e00f85de1de4024c7a281eab8dd48509a53 /gnu/system
parent0b1e2ecb2596d2aed3289396539094c8ecbfdd1a (diff)
downloadpatches-acc0f6bb5885e661a406a367a9543debc455221a.tar
patches-acc0f6bb5885e661a406a367a9543debc455221a.tar.gz
guix system: Add file system label and uuid to iso9660-image.
* gnu/system/vm.scm (system-disk-image): Pass root-label to ... (iso9660-image): ... here. Add keyword arguments #:file-system-label and #:file-system-uuid.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/vm.scm8
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index f1c650c97b..3e722d0815 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -177,6 +177,8 @@ made available under the /xchg CIFS share."
(define* (iso9660-image #:key
(name "iso9660-image")
+ file-system-label
+ file-system-uuid
(system (%current-system))
(qemu qemu-minimal)
os-drv
@@ -211,7 +213,9 @@ INPUTS is a list of inputs (as for packages)."
(make-iso9660-image #$(bootloader-package bootloader)
#$bootcfg-drv
#$os-drv
- "/xchg/guixsd.iso")
+ "/xchg/guixsd.iso"
+ #:volume-id #$file-system-label
+ #:volume-uuid #$file-system-uuid)
(reboot))))
#:system system
#:make-disk-image? #f
@@ -363,6 +367,8 @@ to USB sticks meant to be read-only."
(bootcfg (operating-system-bootcfg os)))
(if (string=? "iso9660" file-system-type)
(iso9660-image #:name name
+ #:file-system-label root-label
+ #:file-system-uuid #f
#:os-drv os-drv
#:bootcfg-drv bootcfg
#:bootloader (bootloader-configuration-bootloader