guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

10/14: gnu: system: Move file-system->spec to (gnu system file-systems).


From: David Thompson
Subject: 10/14: gnu: system: Move file-system->spec to (gnu system file-systems).
Date: Tue, 30 Jun 2015 01:54:08 +0000

davexunit pushed a commit to branch wip-container
in repository guix.

commit 2a9747d5d9f38f0772db4cc495951a7a14215e7f
Author: David Thompson <address@hidden>
Date:   Sun Jun 28 00:39:43 2015 -0400

    gnu: system: Move file-system->spec to (gnu system file-systems).
    
    * gnu/system/linux-initrd.scm (file-system->spec): Move this...
    * gnu/system/file-systems.scm: ... to here.
---
 gnu/system/file-systems.scm |   10 ++++++++++
 gnu/system/linux-initrd.scm |    7 -------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index cbaca88..b33f826 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -17,6 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu system file-systems)
+  #:use-module (ice-9 match)
   #:use-module (guix gexp)
   #:use-module (guix records)
   #:use-module (guix store)
@@ -33,6 +34,8 @@
             file-system-check?
             file-system-create-mount-point?
 
+            file-system->spec
+
             %fuse-control-file-system
             %binary-format-file-system
             %shared-memory-file-system
@@ -95,6 +98,13 @@ file system."
   (or (%file-system-needed-for-boot? fs)
       (string=? "/" (file-system-mount-point fs))))
 
+(define (file-system->spec fs)
+  "Return a list corresponding to file-system FS that can be passed to the
+initrd code."
+  (match fs
+    (($ <file-system> device title mount-point type flags options _ check?)
+     (list device title mount-point type flags options check?))))
+
 (define %fuse-control-file-system
   ;; Control file system for Linux' file systems in user-space (FUSE).
   (file-system
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 74dacf1..2b7ae71 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -132,13 +132,6 @@ MODULES and taken from LINUX."
                                 (guix elf)
                                 (gnu build linux-modules))))
 
-(define (file-system->spec fs)
-  "Return a list corresponding to file-system FS that can be passed to the
-initrd code."
-  (match fs
-    (($ <file-system> device title mount-point type flags options _ check?)
-     (list device title mount-point type flags options check?))))
-
 (define* (base-initrd file-systems
                       #:key
                       (linux linux-libre)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]