From 52ac153e2a83035ce2bc875f9c414cb26db5f6fc Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 22 Sep 2014 21:29:41 +0200
Subject: linux-initrd: Adjust VM code and doc to new 'base-initrd' signature.

This fixes regressions introduced in de1c158 ("system: Add support for
boot-time mapped devices.").

* doc/guix.texi (Initial RAM Disk): Adjust example with custom use of
  'base-initrd'.  Document #:mapped-devices parameter of 'base-initrd'.
* gnu/system/vm.scm (system-disk-image, system-qemu-image,
  virtualized-operating-system): Adjust call to 'base-initrd' to new
  signature.
---
 gnu/system/vm.scm | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'gnu/system')

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index fa4ae78077..799ab51d41 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -289,9 +289,11 @@ to USB sticks meant to be read-only."
               ;; Since this is meant to be used on real hardware, don't
               ;; install QEMU networking or anything like that, but make sure
               ;; USB mass storage devices are available.
-              (initrd (cut base-initrd <>
-                           #:volatile-root? #t
-                           #:extra-modules '("usb-storage.ko")))
+              (initrd (lambda (file-systems . rest)
+                        (apply base-initrd file-systems
+                               #:volatile-root? #t
+                               #:extra-modules '("usb-storage.ko")
+                               rest)))
 
               ;; Force our own root file system.
               (file-systems (cons (file-system
@@ -333,9 +335,11 @@ of the GNU system as described by OS."
 
   (let ((os (operating-system (inherit os)
               ;; Use an initrd with the whole QEMU shebang.
-              (initrd (cut base-initrd <>
-                           #:virtio? #t
-                           #:qemu-networking? #t))
+              (initrd (lambda (file-systems . rest)
+                        (apply base-initrd file-systems
+                               #:virtio? #t
+                               #:qemu-networking? #t
+                               rest)))
 
               ;; Force our own root file system.
               (file-systems (cons (file-system
@@ -358,10 +362,12 @@ of the GNU system as described by OS."
   "Return an operating system based on OS suitable for use in a virtualized
 environment with the store shared with the host."
   (operating-system (inherit os)
-    (initrd (cut base-initrd <>
-                 #:volatile-root? #t
-                 #:virtio? #t
-                 #:qemu-networking? #t))
+    (initrd (lambda (file-systems . rest)
+              (apply base-initrd file-systems
+                     #:volatile-root? #t
+                     #:virtio? #t
+                     #:qemu-networking? #t
+                     rest)))
     (file-systems (cons* (file-system
                            (mount-point "/")
                            (device "/dev/vda1")
-- 
cgit v1.2.3