diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-06-30 20:56:45 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-07-01 09:23:32 +0200 |
| commit | 060238ae64dff916a95e4f55fb3eec542d5dc8a7 (patch) | |
| tree | fd82f6fae5510f6d3cdd87fa81ea0a1d1aced729 /gnu/system/vm.scm | |
| parent | 4fc96187b926f757980d433d417cafe74dcf6b12 (diff) | |
| download | guix-060238ae64dff916a95e4f55fb3eec542d5dc8a7.tar guix-060238ae64dff916a95e4f55fb3eec542d5dc8a7.tar.gz | |
linux-initrd: Rename 'qemu-initrd' to 'base-initrd'.
* gnu/system/linux-initrd.scm (qemu-initrd): Rename to...
(base-initrd): ... this.
* gnu/system.scm (<operating-system>)[initrd]: Update accordingly.
* gnu/system/vm.scm (expression->derivation-in-linux-vm,
system-disk-image, virtualized-operating-system): Likewise.
Diffstat (limited to 'gnu/system/vm.scm')
| -rw-r--r-- | gnu/system/vm.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 4796566612..50f7e6f692 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -153,7 +153,7 @@ made available under the /xchg CIFS share." (coreutils -> (car (assoc-ref %final-inputs "coreutils"))) (initrd (if initrd ; use the default initrd? (return initrd) - (qemu-initrd %linux-vm-file-systems + (base-initrd %linux-vm-file-systems #:virtio? #t #:qemu-networking? #t #:guile-modules-in-chroot? #t)))) @@ -287,7 +287,7 @@ to USB sticks meant to be read-only." (let ((os (operating-system (inherit os) ;; Since this is meant to be used on real hardware, don't set up ;; QEMU networking. - (initrd (cut qemu-initrd <> + (initrd (cut base-initrd <> #:volatile-root? volatile?)) ;; Force our own root file system. @@ -350,7 +350,7 @@ 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 qemu-initrd <> + (initrd (cut base-initrd <> #:volatile-root? #t #:virtio? #t #:qemu-networking? #t)) |