From 6c1df0819ca888e249ee097622f03b424b44b24e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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/build/linux-boot.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu/build/linux-boot.scm') 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 @@ bailing out.~%root contents: ~s~%" (scandir "/")) (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 @@ if any. 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 @@ to it are lost." (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") -- cgit v1.2.3