diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-09-03 14:19:51 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-09-03 15:43:07 +0200 |
| commit | e2f4b305d0b7cff1e19c7f67ea633ef8a971e712 (patch) | |
| tree | 65302d216abc0b0811e4beb41179f586abe01a41 /gnu/system | |
| parent | 8a9e21d1f719748213414343cd02ec113ebe90c1 (diff) | |
Move part of (gnu build linux-boot) to (gnu build file-systems).
* gnu/build/linux-boot.scm (%ext2-endianness, %ext2-sblock-magic,
%ext2-sblock-creator-os, %ext2-sblock-uuid, %ext2-sblock-volume-name,
read-ext2-superblock, ext2-superblock-uuid,
ext2-superblock-volume-name, disk-partitions,
partition-label-predicate, find-partition-by-label,
canonicalize-device-spec, MS_RDONLY, MS_NOSUID, MS_NODEV, MS_NOEXEC,
MS_BIND, MS_MOVE, bind-mount, check-file-system,
mount-flags->bit-mask, mount-file-system): Move to...
* gnu/build/file-systems.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* gnu/services/base.scm: Use (gnu build file-systems).
* gnu/services/dmd.scm (dmd-configuration-file): Likewise.
* gnu/system.scm (operating-system-activation-script): Likewise.
* gnu/system/linux-initrd.scm (base-initrd): Likewise.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Likewise.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/linux-initrd.scm | 3 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 93c739c99e..c4ab73ec9a 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -293,7 +293,8 @@ exception and backtrace!)." #:volatile-root? '#$volatile-root?)) #:name "base-initrd" #:modules '((guix build utils) - (gnu build linux-boot)) + (gnu build linux-boot) + (gnu build file-systems)) #:to-copy helper-packages #:linux linux-libre #:linux-modules linux-modules)) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 3e26dfb700..d263edb4f1 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -115,6 +115,7 @@ input tuple. The output file name is when building for SYSTEM." '((gnu build vm) (gnu build install) (gnu build linux-boot) + (gnu build file-systems) (guix build utils))) (guile-for-build (%guile-for-build)) |