aboutsummaryrefslogtreecommitdiff
path: root/doc/guix.texi
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-09-11 18:26:28 -0400
committerMark H Weaver <mhw@netris.org>2014-09-11 18:26:28 -0400
commit66ea98e321e93b0806f6870d77dd4c00e7e720c0 (patch)
tree21778401485e3b8683bbc6a31769233c059683b1 /doc/guix.texi
parentda5538ef44bfa74d3e435f9f557374eabba5dc1e (diff)
parent5dae0186dea1e72e73bf223161620cfeddef5a63 (diff)
downloadguix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar.gz
guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.zip
Merge branch 'master' into core-updates
Conflicts: gnu/packages/image.scm
Diffstat (limited to 'doc/guix.texi')
-rw-r--r--doc/guix.texi12
1 files changed, 5 insertions, 7 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index e0251f5ffd..e3b0cf61f0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3616,16 +3616,14 @@ program to run in that initrd.
@deffn {Monadic Procedure} expression->initrd @var{exp} @
[#:guile %guile-static-stripped] [#:name "guile-initrd"] @
- [#:modules '()] [#:to-copy '()] [#:linux #f] @
- [#:linux-modules '()]
+ [#:modules '()]
Return a derivation that builds a Linux initrd (a gzipped cpio archive)
containing @var{guile} and that evaluates @var{exp}, a G-expression,
-upon booting.
+upon booting. All the derivations referenced by @var{exp} are
+automatically copied to the initrd.
-@var{linux-modules} is a list of @file{.ko} file names to be copied from
-@var{linux} into the initrd. @var{to-copy} is a list of additional
-derivations or packages to copy to the initrd. @var{modules} is a list
-of Guile module names to be embedded in the initrd.
+@var{modules} is a list of Guile module names to be embedded in the
+initrd.
@end deffn
@node Invoking guix system