diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-01-01 22:29:33 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-01-01 22:34:13 +0100 |
commit | 29824d80ec3b86bcf68afc1a9d903e2a3c479533 (patch) | |
tree | befa47868ab222a8924c6ec9d72750d6ccee221d /gnu/system | |
parent | daa8922abc63b2491490ad1898b613f5653a19b1 (diff) | |
download | guix-29824d80ec3b86bcf68afc1a9d903e2a3c479533.tar guix-29824d80ec3b86bcf68afc1a9d903e2a3c479533.tar.gz |
system: Allow the root file system to have a UUID.
This is a followup to ab64483.
* gnu/system.scm (mapped-device-user): Check whether the title of FS is
'device before calling 'string=?'.
* gnu/system/vm.scm (virtualized-operating-system)[user-file-systems]:
Likewise.
Diffstat (limited to 'gnu/system')
-rw-r--r-- | gnu/system/vm.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 1492a0bb1c..3cba400a57 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -391,7 +391,8 @@ 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 "/") - (string-prefix? "/dev/" source)))) + (and (eq? 'device (file-system-title fs)) + (string-prefix? "/dev/" source))))) (operating-system-file-systems os))) (operating-system (inherit os) |