diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-09-18 23:05:22 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-09-18 23:05:22 +0200 |
| commit | 6c1df0819ca888e249ee097622f03b424b44b24e (patch) | |
| tree | e30bddba018538c10c29ed634ea5ca8473bc9614 /gnu/system | |
| parent | dbcb0ab1a9309ae6c840d67110616d141c3307b3 (diff) | |
| download | guix-patches-6c1df0819ca888e249ee097622f03b424b44b24e.tar guix-patches-6c1df0819ca888e249ee097622f03b424b44b24e.tar.gz | |
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.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/linux-initrd.scm | 11 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 3 |
2 files changed, 3 insertions, 11 deletions
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 @@ initrd code." 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 @@ to it are lost. 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 @@ exception and backtrace!)." (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 @@ made available under the /xchg CIFS share." (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. |