aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-09-03 11:14:12 +0200
committerLudovic Courtès <ludo@gnu.org>2014-09-03 15:43:07 +0200
commit8a9e21d1f719748213414343cd02ec113ebe90c1 (patch)
treea797acf09699ec6f233e88c6ccef23eeddd83185
parent548f7a8fa2a4745d0e35e175e201513857440991 (diff)
downloadguix-8a9e21d1f719748213414343cd02ec113ebe90c1.tar
guix-8a9e21d1f719748213414343cd02ec113ebe90c1.tar.gz
Rename (gnu build linux-initrd) to (gnu build linux-boot).
* gnu/build/linux-initrd.scm: Rename to... * gnu/build/linux-boot.scm: ... this. * gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu/build/activation.scm, gnu/build/vm.scm, gnu/services/base.scm, gnu/services/dmd.scm, gnu/system.scm, gnu/system/linux-initrd.scm, gnu/system/vm.scm: Adjust accordingly.
-rw-r--r--gnu-system.am2
-rw-r--r--gnu/build/activation.scm2
-rw-r--r--gnu/build/linux-boot.scm (renamed from gnu/build/linux-initrd.scm)2
-rw-r--r--gnu/build/vm.scm2
-rw-r--r--gnu/services/base.scm2
-rw-r--r--gnu/services/dmd.scm4
-rw-r--r--gnu/system.scm2
-rw-r--r--gnu/system/linux-initrd.scm6
-rw-r--r--gnu/system/vm.scm2
9 files changed, 12 insertions, 12 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 2c303ac109..8e7de7c622 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -281,7 +281,7 @@ GNU_SYSTEM_MODULES = \
\
gnu/build/activation.scm \
gnu/build/install.scm \
- gnu/build/linux-initrd.scm \
+ gnu/build/linux-boot.scm \
gnu/build/vm.scm
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index bb1165ac47..362669cbf9 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu build activation)
- #:use-module (gnu build linux-initrd)
+ #:use-module (gnu build linux-boot)
#:use-module (guix build utils)
#:use-module (ice-9 ftw)
#:use-module (ice-9 match)
diff --git a/gnu/build/linux-initrd.scm b/gnu/build/linux-boot.scm
index 60c5eec10f..24000e191a 100644
--- a/gnu/build/linux-initrd.scm
+++ b/gnu/build/linux-boot.scm
@@ -16,7 +16,7 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-(define-module (gnu build linux-initrd)
+(define-module (gnu build linux-boot)
#:use-module (rnrs io ports)
#:use-module (rnrs bytevectors)
#:use-module (system foreign)
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index d724ca3a55..ad63a2240d 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -18,7 +18,7 @@
(define-module (gnu build vm)
#:use-module (guix build utils)
- #:use-module (gnu build linux-initrd)
+ #:use-module (gnu build linux-boot)
#:use-module (gnu build install)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 274b6f5b77..e9adb47ac0 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-initrd)
+ #:use-module ((gnu build linux-boot)
#: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 87bd67a8da..d1fa58f9d7 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-initrd)
+ (gnu build linux-boot)
(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-initrd)
+ ((gnu build linux-boot)
#:select (check-file-system canonicalize-device-spec)))
(register-services
diff --git a/gnu/system.scm b/gnu/system.scm
index 963f4864f8..e011a00f16 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -363,7 +363,7 @@ stateful part of OS, including user accounts and groups, special directories,
etc."
(define %modules
'((gnu build activation)
- (gnu build linux-initrd)
+ (gnu build linux-boot)
(guix build utils)))
(define (service-activations services)
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 6d9e23277f..93c739c99e 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -75,7 +75,7 @@ initrd."
(mlet* %store-monad ((source (imported-modules modules))
(compiled (compiled-modules modules)))
(define builder
- ;; TODO: Move most of this code to (gnu build linux-initrd).
+ ;; TODO: Move most of this code to (gnu build linux-boot).
#~(begin
(use-modules (guix build utils)
(ice-9 pretty-print)
@@ -277,7 +277,7 @@ exception and backtrace!)."
(expression->initrd
#~(begin
- (use-modules (gnu build linux-initrd)
+ (use-modules (gnu build linux-boot)
(guix build utils)
(srfi srfi-26))
@@ -293,7 +293,7 @@ exception and backtrace!)."
#:volatile-root? '#$volatile-root?))
#:name "base-initrd"
#:modules '((guix build utils)
- (gnu build linux-initrd))
+ (gnu build linux-boot))
#:to-copy helper-packages
#:linux linux-libre
#:linux-modules linux-modules))
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index be9cf6b457..3e26dfb700 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -114,7 +114,7 @@ input tuple. The output file name is when building for SYSTEM."
(modules
'((gnu build vm)
(gnu build install)
- (gnu build linux-initrd)
+ (gnu build linux-boot)
(guix build utils)))
(guile-for-build
(%guile-for-build))