~ruther/guix-local

575b4b092d73403381277625794042a7b7253cfe — David Thompson 10 years ago 9110c2e
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.
2 files changed, 10 insertions(+), 7 deletions(-)

M gnu/system/file-systems.scm
M gnu/system/linux-initrd.scm
M gnu/system/file-systems.scm => gnu/system/file-systems.scm +10 -0
@@ 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

M gnu/system/linux-initrd.scm => gnu/system/linux-initrd.scm +0 -7
@@ 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)