9 files changed, 12 insertions(+), 12 deletions(-)

M gnu-system.am
M gnu/build/activation.scm
R gnu/build/{linux-initrd => linux-boot}.scm
M gnu/build/vm.scm
M gnu/services/base.scm
M gnu/services/dmd.scm
M gnu/system.scm
M gnu/system/linux-initrd.scm
M gnu/system/vm.scm

@@ 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
 
 

@@ 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)

@@ 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)

@@ 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)

@@ 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)

@@ 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

@@ 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)

@@ 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))

@@ 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))