01/01: vm: Use os-defined initrd intead of base-initrd.

[Mathieu Othacehe]

mothacehe pushed a commit to branch master
in repository guix.

commit b8e7781122d0d61891b38acdf427d09fb894c307
Author: Mathieu Othacehe <address@hidden>
Date:   Fri Nov 24 17:35:12 2017 +0100

    vm: Use os-defined initrd intead of base-initrd.
    
    * gnu/system/vm.scm (system-disk-image, system-qemu-image,
      virtualized-operating-system): Replace base-initrd by
      (operating-system-initrd os).
    
    The system produced were always using base-initrd even if the user had
    defined a custom initrd based on raw-initrd in the os declaration.
---
 gnu/system/vm.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 4424608..3ddb41d 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -423,7 +423,8 @@ to USB sticks meant to be read-only."
               ;; install QEMU networking or anything like that.  Assume USB
               ;; mass storage devices (usb-storage.ko) are available.
               (initrd (lambda (file-systems . rest)
-                        (apply base-initrd file-systems
+                        (apply (operating-system-initrd os)
+                               file-systems
                                #:volatile-root? #t
                                rest)))
 
@@ -488,7 +489,8 @@ of the GNU system as described by OS."
   (let ((os (operating-system (inherit os)
               ;; Use an initrd with the whole QEMU shebang.
               (initrd (lambda (file-systems . rest)
-                        (apply base-initrd file-systems
+                        (apply (operating-system-initrd os)
+                               file-systems
                                #:virtio? #t
                                rest)))
 
@@ -574,7 +576,8 @@ environment with the store shared with the host.  MAPPINGS 
is a list of
                   (target "/dev/vda")))
 
     (initrd (lambda (file-systems . rest)
-              (apply base-initrd file-systems
+              (apply (operating-system-initrd os)
+                     file-systems
                      #:volatile-root? #t
                      #:virtio? #t
                      rest)))