diff options
author | Ludovic Courtès <ludo@gnu.org> | 2014-05-20 21:59:08 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2014-05-20 23:37:11 +0200 |
commit | c5df183956016cf3205971f4fa30aa834dca3281 (patch) | |
tree | 14af2e9deaa2fec2df58e437fcdff0b44608daee /gnu/system.scm | |
parent | eb7ccb1afaaa5db3a6c4fdec0a9f22919d100952 (diff) | |
download | patches-c5df183956016cf3205971f4fa30aa834dca3281.tar patches-c5df183956016cf3205971f4fa30aa834dca3281.tar.gz |
Add (gnu system file-systems).
This fixes a circular dependency between (gnu system) and (gnu system
linux-initrd), where the latter could end up being compiled before
'file-system-type' was defined as a macro.
* gnu/system.scm (<file-system>, %fuse-control-file-system,
%binary-format-file-system): Move to...
* gnu/system/file-systems.scm: ... here. New file.
* build-aux/hydra/demo-os.scm, gnu/system/linux-initrd.scm,
gnu/system/vm.scm: Use it.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
Diffstat (limited to 'gnu/system.scm')
-rw-r--r-- | gnu/system.scm | 53 |
1 files changed, 2 insertions, 51 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index dd44878462..6cb7d303db 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -34,6 +34,7 @@ #:use-module (gnu system shadow) #:use-module (gnu system linux) #:use-module (gnu system linux-initrd) + #:use-module (gnu system file-systems) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) @@ -56,20 +57,7 @@ operating-system-derivation operating-system-profile - operating-system-grub.cfg - - <file-system> - file-system - file-system? - file-system-device - file-system-mount-point - file-system-type - file-system-needed-for-boot? - file-system-flags - file-system-options - - %fuse-control-file-system - %binary-format-file-system)) + operating-system-grub.cfg)) ;;; Commentary: ;;; @@ -131,43 +119,6 @@ ;;; -;;; File systems. -;;; - -;; File system declaration. -(define-record-type* <file-system> file-system - make-file-system - file-system? - (device file-system-device) ; string - (mount-point file-system-mount-point) ; string - (type file-system-type) ; string - (flags file-system-flags ; list of symbols - (default '())) - (options file-system-options ; string or #f - (default #f)) - (needed-for-boot? file-system-needed-for-boot? ; Boolean - (default #f)) - (check? file-system-check? ; Boolean - (default #t))) - -(define %fuse-control-file-system - ;; Control file system for Linux' file systems in user-space (FUSE). - (file-system - (device "fusectl") - (mount-point "/sys/fs/fuse/connections") - (type "fusectl") - (check? #f))) - -(define %binary-format-file-system - ;; Support for arbitrary executable binary format. - (file-system - (device "binfmt_misc") - (mount-point "/proc/sys/fs/binfmt_misc") - (type "binfmt_misc") - (check? #f))) - - -;;; ;;; Derivation. ;;; |