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 /build-aux | |
| parent | eb7ccb1afaaa5db3a6c4fdec0a9f22919d100952 (diff) | |
| download | gnu-guix-c5df183956016cf3205971f4fa30aa834dca3281.tar gnu-guix-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 'build-aux')
| -rw-r--r-- | build-aux/hydra/demo-os.scm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build-aux/hydra/demo-os.scm b/build-aux/hydra/demo-os.scm index fe9c77242e..5f0fd6a6f8 100644 --- a/build-aux/hydra/demo-os.scm +++ b/build-aux/hydra/demo-os.scm @@ -36,6 +36,8 @@ (gnu system grub) ; 'grub-configuration' (gnu system shadow) ; 'user-account' (gnu system linux) ; 'base-pam-services' + (gnu system file-systems) ; 'file-systems' + (gnu services base) (gnu services networking) (gnu services xorg)) |