From 6c1df0819ca888e249ee097622f03b424b44b24e Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 18 Sep 2014 23:05:22 +0200
Subject: linux-initrd: Remove now obsolete #:guile-modules-in-chroot?
 parameter.

* gnu/build/linux-boot.scm (boot-system): Remove
  #:guile-modules-in-chroot? and related code.
* gnu/system/linux-initrd.scm (base-initrd): Likewise.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Remove
  #:guile-modules-in-chroot? argument in 'base-initrd' call.
---
 gnu/system/linux-initrd.scm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'gnu/system/linux-initrd.scm')

diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 93f751b757..cb04644053 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -129,8 +129,7 @@ (define* (base-initrd file-systems
                       qemu-networking?
                       virtio?
                       volatile-root?
-                      (extra-modules '())
-                      guile-modules-in-chroot?)
+                      (extra-modules '()))
   ;; TODO: Support boot-time device mappings.
   "Return a monadic derivation that builds a generic initrd.  FILE-SYSTEMS is
 a list of file-systems to be mounted by the initrd, possibly in addition to
@@ -146,12 +145,7 @@ (define* (base-initrd file-systems
 The initrd is automatically populated with all the kernel modules necessary
 for FILE-SYSTEMS and for the given options.  However, additional kernel
 modules can be listed in EXTRA-MODULES.  They will be added to the initrd, and
-loaded at boot time in the order in which they appear.
-
-When GUILE-MODULES-IN-CHROOT? is true, make core Guile modules available in
-the new root.  This is necessary is the file specified as '--load' needs
-access to these modules (which is the case if it wants to even just print an
-exception and backtrace!)."
+loaded at boot time in the order in which they appear."
   (define virtio-modules
     ;; Modules for Linux para-virtualized devices, for use in QEMU guests.
     '("virtio.ko" "virtio_ring.ko" "virtio_pci.ko"
@@ -215,7 +209,6 @@ (define helper-packages
                                              (string-append #$kodir "/" file))
                                            '#$linux-modules)
                       #:qemu-guest-networking? #$qemu-networking?
-                      #:guile-modules-in-chroot? '#$guile-modules-in-chroot?
                       #:volatile-root? '#$volatile-root?))
      #:name "base-initrd"
      #:modules '((guix build utils)
-- 
cgit v1.2.3