nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Mathieu Othacehe 2017-11-24 17:35:12 +01:00
parent 64047c850f
commit b8e7781122
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/system/vm.scm
View File

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