aboutsummaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-06-02 23:58:50 +0200
committerLudovic Courtès <ludo@gnu.org>2014-06-03 00:14:58 +0200
commitd4c87617e5c0c50573019e4621ed318489cf209a (patch)
tree5027b6bc308940b1c746f9081ace608bafb841a0 /gnu/system
parent2405858a0477aca880bb32c032df459de68e1bfd (diff)
downloadguix-d4c87617e5c0c50573019e4621ed318489cf209a.tar
guix-d4c87617e5c0c50573019e4621ed318489cf209a.tar.gz
system: File system sources can be marked as labels or devices.
* gnu/system/file-systems.scm (<file-system>)[title]: New field. * gnu/services/base.scm (file-system-service): Add #:title parameter. In 'start' gexp, use 'canonicalize-device-spec' and honor TITLE. * gnu/system.scm (other-file-system-services, operating-system-root-file-system, operating-system-initrd-file): Adjust accordingly. * gnu/system/linux-initrd.scm (file-system->spec): Likewise. * gnu/system/vm.scm (system-disk-image): Add 'title' field for the root file system. * guix/build/linux-initrd.scm (mount-file-system): Expect the second element of SPEC to be the title. (boot-system)[root-mount-point?, root-fs-type]: Likewise. * gnu/services/dmd.scm (dmd-configuration-file): Select 'canonicalize-device-spec'.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/file-systems.scm3
-rw-r--r--gnu/system/linux-initrd.scm4
-rw-r--r--gnu/system/vm.scm1
3 files changed, 6 insertions, 2 deletions
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index 485150ea51..7852a6ab26 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -22,6 +22,7 @@
file-system
file-system?
file-system-device
+ file-system-title
file-system-mount-point
file-system-type
file-system-needed-for-boot?
@@ -42,6 +43,8 @@
make-file-system
file-system?
(device file-system-device) ; string
+ (title file-system-title ; 'device | 'label | 'uuid
+ (default 'device))
(mount-point file-system-mount-point) ; string
(type file-system-type) ; string
(flags file-system-flags ; list of symbols
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index b80ff10f1e..17fec4f7f4 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -198,8 +198,8 @@ a list of Guile module names to be embedded in the initrd."
"Return a list corresponding to file-system FS that can be passed to the
initrd code."
(match fs
- (($ <file-system> device mount-point type flags options _ check?)
- (list device mount-point type flags options check?))))
+ (($ <file-system> device title mount-point type flags options _ check?)
+ (list device title mount-point type flags options check?))))
(define* (qemu-initrd file-systems
#:key
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 184f2512f1..c85445cd5f 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -290,6 +290,7 @@ to USB sticks meant to be read-only."
(file-systems (cons (file-system
(mount-point "/")
(device root-label)
+ (title 'label)
(type file-system-type))
file-systems-to-keep)))))