ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* gnu/system/linux-initrd.scm (file-system->spec): Move this...
* gnu/system/file-systems.scm: ... to here.
This commit is contained in:
David Thompson 2015-06-28 00:39:43 -04:00 committed by David Thompson
parent 9110c2e942
commit 575b4b092d
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/system/file-systems.scm
View file

@ -17,6 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu system file-systems) (define-module (gnu system file-systems)
#:use-module (ice-9 match)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix store) #:use-module (guix store)
@ -33,6 +34,8 @@ (define-module (gnu system file-systems)
file-system-check? file-system-check?
file-system-create-mount-point? file-system-create-mount-point?
file-system->spec
%fuse-control-file-system %fuse-control-file-system
%binary-format-file-system %binary-format-file-system
%shared-memory-file-system %shared-memory-file-system
@ -95,6 +98,13 @@ (define-inlinable (file-system-needed-for-boot? fs)
(or (%file-system-needed-for-boot? fs) (or (%file-system-needed-for-boot? fs)
(string=? "/" (file-system-mount-point 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 (define %fuse-control-file-system
;; Control file system for Linux' file systems in user-space (FUSE). ;; Control file system for Linux' file systems in user-space (FUSE).
(file-system (file-system

7
gnu/system/linux-initrd.scm
View file

@ -132,13 +132,6 @@ (define modules
(guix elf) (guix elf)
(gnu build linux-modules)))) (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 (define* (base-initrd file-systems
#:key #:key
(linux linux-libre) (linux linux-libre)