1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-15 05:35:53 +02:00

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.
This commit is contained in:
Ludovic Courtès
2014-09-22 21:29:41 +02:00
parent 8591fae4cf
commit 52ac153e2a
2 changed files with 26 additions and 19 deletions
+16 -10
View File
@@ -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")