From e2f4b305d0b7cff1e19c7f67ea633ef8a971e712 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Sep 2014 14:19:51 +0200 Subject: 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. --- gnu/services/base.scm | 2 +- gnu/services/dmd.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/services') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index e9adb47ac0..b5b49d1a01 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -29,7 +29,7 @@ #:use-module ((gnu packages base) #:select (canonical-package glibc)) #:use-module (gnu packages package-management) - #:use-module ((gnu build linux-boot) + #:use-module ((gnu build file-systems) #:select (mount-flags->bit-mask)) #:use-module (guix gexp) #:use-module (guix monads) diff --git a/gnu/services/dmd.scm b/gnu/services/dmd.scm index d1fa58f9d7..59c2373779 100644 --- a/gnu/services/dmd.scm +++ b/gnu/services/dmd.scm @@ -35,7 +35,7 @@ (define modules ;; Extra modules visible to dmd.conf. '((guix build syscalls) - (gnu build linux-boot) + (gnu build file-systems) (guix build utils))) (mlet %store-monad ((modules (imported-modules modules)) @@ -50,7 +50,7 @@ (use-modules (ice-9 ftw) (guix build syscalls) (guix build utils) - ((gnu build linux-boot) + ((gnu build file-systems) #:select (check-file-system canonicalize-device-spec))) (register-services -- cgit v1.2.3