diff options
author | Ludovic Courtès <ludo@gnu.org> | 2014-06-02 23:58:50 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2014-06-03 00:14:58 +0200 |
commit | d4c87617e5c0c50573019e4621ed318489cf209a (patch) | |
tree | 5027b6bc308940b1c746f9081ace608bafb841a0 /gnu/system/file-systems.scm | |
parent | 2405858a0477aca880bb32c032df459de68e1bfd (diff) | |
download | guix-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/file-systems.scm')
-rw-r--r-- | gnu/system/file-systems.scm | 3 |
1 files changed, 3 insertions, 0 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 |