From 6c1df0819ca888e249ee097622f03b424b44b24e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 18 Sep 2014 23:05:22 +0200
Subject: [PATCH] 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/build/linux-boot.scm    | 17 -----------------
 gnu/system/linux-initrd.scm | 11 ++---------
 gnu/system/vm.scm           |  3 +--
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index fbc683c798..56042da8f6 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -339,7 +339,6 @@ (define (switch-root root)
 (define* (boot-system #:key
                       (linux-modules '())
                       qemu-guest-networking?
-                      guile-modules-in-chroot?
                       volatile-root?
                       (mounts '()))
   "This procedure is meant to be called from an initrd.  Boot a system by
@@ -354,9 +353,6 @@ (define* (boot-system #:key
 
 MOUNTS must be a list suitable for 'mount-file-system'.
 
-When GUILE-MODULES-IN-CHROOT? is true, make core Guile modules available in
-the new root.
-
 When VOLATILE-ROOT? is true, the root file system is writable but any changes
 to it are lost."
   (define root-mount-point?
@@ -411,19 +407,6 @@ (define root-fs-type
        (for-each mount-file-system
                  (remove root-mount-point? mounts))
 
-       (when guile-modules-in-chroot?
-         ;; Copy the directories that contain .scm and .go files so that the
-         ;; child process in the chroot can load modules (we would bind-mount
-         ;; them but for some reason that fails with EINVAL -- XXX).
-         (mkdir-p "/root/share")
-         (mkdir-p "/root/lib")
-         (mount "none" "/root/share" "tmpfs")
-         (mount "none" "/root/lib" "tmpfs")
-         (copy-recursively "/share" "/root/share"
-                           #:log (%make-void-port "w"))
-         (copy-recursively "/lib" "/root/lib"
-                           #:log (%make-void-port "w")))
-
        (if to-load
            (begin
              (switch-root "/root")
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)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 4ee8dc5cf2..fa4ae78077 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -159,8 +159,7 @@ (define* (expression->derivation-in-linux-vm name exp
                          (return initrd)
                          (base-initrd %linux-vm-file-systems
                                       #:virtio? #t
-                                      #:qemu-networking? #t
-                                      #:guile-modules-in-chroot? #t))))
+                                      #:qemu-networking? #t))))
 
     (define builder
       ;; Code that launches the VM that evaluates EXP.