summaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-06-30 20:56:45 +0200
committerLudovic Courtès <ludo@gnu.org>2014-07-01 09:23:32 +0200
commit060238ae64dff916a95e4f55fb3eec542d5dc8a7 (patch)
treefd82f6fae5510f6d3cdd87fa81ea0a1d1aced729 /gnu/system
parent4fc96187b926f757980d433d417cafe74dcf6b12 (diff)
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')
-rw-r--r--gnu/system/linux-initrd.scm13
-rw-r--r--gnu/system/vm.scm6
2 files changed, 9 insertions, 10 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 3edbf5046b..99df8cd185 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -35,7 +35,7 @@
#:use-module (ice-9 regex)
#:use-module (srfi srfi-1)
#:export (expression->initrd
- qemu-initrd))
+ base-initrd))
;;; Commentary:
@@ -201,16 +201,15 @@ initrd code."
(($ <file-system> device title mount-point type flags options _ check?)
(list device title mount-point type flags options check?))))
-(define* (qemu-initrd file-systems
+(define* (base-initrd file-systems
#:key
qemu-networking?
virtio?
volatile-root?
guile-modules-in-chroot?)
- "Return a monadic derivation that builds an initrd for use in a QEMU guest
-where the store is shared with the host. FILE-SYSTEMS is a list of
-file-systems to be mounted by the initrd, possibly in addition to the root
-file system specified on the kernel command line via '--root'.
+ "Return a monadic derivation that builds a generic initrd. FILE-SYSTEMS is
+a list of file-systems to be mounted by the initrd, possibly in addition to
+the root file system specified on the kernel command line via '--root'.
When QEMU-NETWORKING? is true, set up networking with the standard QEMU
parameters. When VIRTIO? is true, load additional modules so the initrd can
@@ -282,7 +281,7 @@ exception and backtrace!)."
#:qemu-guest-networking? #$qemu-networking?
#:guile-modules-in-chroot? '#$guile-modules-in-chroot?
#:volatile-root? '#$volatile-root?))
- #:name "qemu-initrd"
+ #:name "base-initrd"
#:modules '((guix build utils)
(guix build linux-initrd))
#:to-copy helper-packages
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))