aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-08-04 19:08:08 +0200
committerLudovic Courtès <ludo@gnu.org>2016-08-04 19:38:33 +0200
commitd77a0bd6f1aa709fcec1041fcdde33942335d75b (patch)
tree98739b113d27c1372bcc9caada79bc8000e0267d
parent44210f84e274a3dd59da15d7bd2bd5f30f97efb4 (diff)
downloadgnu-guix-d77a0bd6f1aa709fcec1041fcdde33942335d75b.tar
gnu-guix-d77a0bd6f1aa709fcec1041fcdde33942335d75b.tar.gz
ui: Remove dependency on (gnu system file-systems).
* guix/ui.scm (specification->file-system-mapping): Move to... * gnu/system/file-systems.scm (specification->file-system-mapping): ... here.
-rw-r--r--gnu/system/file-systems.scm18
-rw-r--r--guix/ui.scm19
2 files changed, 18 insertions, 19 deletions
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index f4cfaf0990..116e2813e8 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -40,6 +40,7 @@
file-system-dependencies
file-system->spec
+ specification->file-system-mapping
uuid
%fuse-control-file-system
@@ -105,6 +106,23 @@ initrd code."
(($ <file-system> device title mount-point type flags options _ _ check?)
(list device title mount-point type flags options check?))))
+(define (specification->file-system-mapping spec writable?)
+ "Read the SPEC and return the corresponding <file-system-mapping>. SPEC is
+a string of the form \"SOURCE\" or \"SOURCE=TARGET\". The former specifies
+that SOURCE from the host should be mounted at SOURCE in the other system.
+The latter format specifies that SOURCE from the host should be mounted at
+TARGET in the other system."
+ (let ((index (string-index spec #\=)))
+ (if index
+ (file-system-mapping
+ (source (substring spec 0 index))
+ (target (substring spec (+ 1 index)))
+ (writable? writable?))
+ (file-system-mapping
+ (source spec)
+ (target spec)
+ (writable? writable?)))))
+
(define-syntax uuid
(lambda (s)
"Return the bytevector corresponding to the given UUID representation."
diff --git a/guix/ui.scm b/guix/ui.scm
index 4d1b65cb8a..906b349845 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -36,7 +36,6 @@
#:use-module ((guix build utils) #:select (mkdir-p))
#:use-module ((guix licenses) #:select (license? license-name))
#:use-module ((guix build syscalls) #:select (terminal-columns))
- #:use-module (gnu system file-systems)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-19)
@@ -83,7 +82,6 @@
string->recutils
package->recutils
package-specification->name+version+output
- specification->file-system-mapping
string->generations
string->duration
matching-generations
@@ -1126,23 +1124,6 @@ optionally contain a version number and an output name, as in these examples:
(package-name->name+version name)))
(values name version sub-drv)))
-(define (specification->file-system-mapping spec writable?)
- "Read the SPEC and return the corresponding <file-system-mapping>. SPEC is
-a string of the form \"SOURCE\" or \"SOURCE=TARGET\". The former specifies
-that SOURCE from the host should be mounted at SOURCE in the other system.
-The latter format specifies that SOURCE from the host should be mounted at
-TARGET in the other system."
- (let ((index (string-index spec #\=)))
- (if index
- (file-system-mapping
- (source (substring spec 0 index))
- (target (substring spec (+ 1 index)))
- (writable? writable?))
- (file-system-mapping
- (source spec)
- (target spec)
- (writable? writable?)))))
-
;;;
;;; Command-line option processing.