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.scm | |
| parent | 2405858a0477aca880bb32c032df459de68e1bfd (diff) | |
| download | patches-d4c87617e5c0c50573019e4621ed318489cf209a.tar patches-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.scm')
| -rw-r--r-- | gnu/system.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index d05ec60b29..548184f5d5 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -182,8 +182,10 @@ as 'needed-for-boot'." (sequence %store-monad (map (match-lambda - (($ <file-system> device target type flags opts #f check?) + (($ <file-system> device title target type flags opts + #f check?) (file-system-service device target type + #:title title #:check? check? #:options opts))) file-systems))) @@ -449,7 +451,7 @@ we're running in the final root." (define (operating-system-root-file-system os) "Return the root file system of OS." (find (match-lambda - (($ <file-system> _ "/") #t) + (($ <file-system> _ _ "/") #t) (_ #f)) (operating-system-file-systems os))) @@ -457,9 +459,10 @@ we're running in the final root." "Return a gexp denoting the initrd file of OS." (define boot-file-systems (filter (match-lambda - (($ <file-system> device "/") + (($ <file-system> device title "/") #t) - (($ <file-system> device mount-point type flags options boot?) + (($ <file-system> device title mount-point type flags + options boot?) boot?)) (operating-system-file-systems os))) |