diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-28 20:45:37 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-28 20:45:37 -0400 |
| commit | 82b695b834f88c5561de40e68f3fe7aa24d3b796 (patch) | |
| tree | 41743fff1013584ee4a50852a94cff01c3cc3d1c /gnu/system/vm.scm | |
| parent | fe365a3d0e4df7445bf16d3bb422a0bc6bb68ceb (diff) | |
| parent | ee3c8fbee21299ce105bafca7dc63bfb096cd7c5 (diff) | |
| download | guix-82b695b834f88c5561de40e68f3fe7aa24d3b796.tar.gz guix-82b695b834f88c5561de40e68f3fe7aa24d3b796.zip | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system/vm.scm')
| -rw-r--r-- | gnu/system/vm.scm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index eb73b5ca7a..4cffc71d7f 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -571,7 +571,6 @@ to USB sticks meant to be read-only." (file-systems (cons (file-system (mount-point "/") (device root-uuid) - (title 'uuid) (type file-system-type)) file-systems-to-keep))))) @@ -636,7 +635,6 @@ of the GNU system as described by OS." (file-systems (cons (file-system (mount-point "/") (device root-uuid) - (title 'uuid) (type file-system-type)) file-systems-to-keep))))) (mlet* %store-monad @@ -693,13 +691,12 @@ environment with the store shared with the host. MAPPINGS is a list of (source (file-system-device fs))) (or (string=? target (%store-prefix)) (string=? target "/") - (and (eq? 'device (file-system-title fs)) + (and (string? source) (string-prefix? "/dev/" source)) ;; Labels and UUIDs are necessarily invalid in the VM. (and (file-system-mount? fs) - (or (eq? 'label (file-system-title fs)) - (eq? 'uuid (file-system-title fs)) + (or (file-system-label? source) (uuid? source)))))) (operating-system-file-systems os))) |