diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2017-11-24 17:35:12 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2017-11-26 13:50:37 +0100 |
| commit | b8e7781122d0d61891b38acdf427d09fb894c307 (patch) | |
| tree | 95020ca32be6b1d6cb3a31e5b748739bbc81f69b | |
| parent | 64047c850fc93bf2bc16ffbfa03addfdf76f02e4 (diff) | |
| download | gnu-guix-b8e7781122d0d61891b38acdf427d09fb894c307.tar gnu-guix-b8e7781122d0d61891b38acdf427d09fb894c307.tar.gz | |
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.
| -rw-r--r-- | gnu/system/vm.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 44246083b3..3ddb41d9a6 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))) |