diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guix.texi | 80 | ||||
| -rw-r--r-- | doc/htmlxref.cnf | 8 |
2 files changed, 75 insertions, 13 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index f1848a1c5d..df8b5a9241 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -187,6 +187,7 @@ System Installation * USB Stick Installation:: Preparing the installation medium. * Preparing for Installation:: Networking, partitioning, etc. * Proceeding with the Installation:: The real thing. +* Installing GuixSD in a VM:: GuixSD playground. * Building the Installation Image:: How this comes to be. System Configuration @@ -1240,7 +1241,7 @@ programs to authenticate Web servers accessed over HTTPS. When using Guix on a foreign distro, you can install this package and define the relevant environment variables so that packages know where to -look for certificates. @pxref{X.509 Certificates}, for detailed +look for certificates. @xref{X.509 Certificates}, for detailed information. @subsection Emacs Packages @@ -4985,6 +4986,8 @@ list of updaters). Currently, @var{updater} may be one of: the updater for GNU packages; @item gnome the updater for GNOME packages; +@item kde +the updater for KDE packages; @item xorg the updater for X.org packages; @item elpa @@ -6027,7 +6030,7 @@ to join! @xref{Contributing}, for information about how you can help. @section System Installation @cindex Guix System Distribution -This section explains how to install the Guix System Distribution +This section explains how to install the Guix System Distribution (GuixSD) on a machine. The Guix package manager can also be installed on top of a running GNU/Linux system, @pxref{Installation}. @@ -6052,6 +6055,7 @@ available. * USB Stick Installation:: Preparing the installation medium. * Preparing for Installation:: Networking, partitioning, etc. * Proceeding with the Installation:: The real thing. +* Installing GuixSD in a VM:: GuixSD playground. * Building the Installation Image:: How this comes to be. @end menu @@ -6197,6 +6201,9 @@ Once this is done, you should be able to reboot the system and boot from the USB stick. The latter usually requires you to get in the BIOS' boot menu, where you can choose to boot from the USB stick. +@xref{Installing GuixSD in a VM}, if, instead, you would like to install +GuixSD in a virtual machine (VM). + @node Preparing for Installation @subsection Preparing for Installation @@ -6454,6 +6461,54 @@ Join us on @code{#guix} on the Freenode IRC network or on @file{guix-devel@@gnu.org} to share your experience---good or not so good. +@node Installing GuixSD in a VM +@subsection Installing GuixSD in a Virtual Machine + +@cindex virtual machine, GuixSD installation +If you'd like to install GuixSD in a virtual machine (VM) rather than on +your beloved machine, this section is for you. + +To boot a @uref{http://qemu.org/,QEMU} VM for installing GuixSD in a +disk image, follow these steps: + +@enumerate +@item +First, retrieve the GuixSD installation image as described previously +(@pxref{USB Stick Installation}). + +@item +Create a disk image that will hold the installed system. To make a +qcow2-formatted disk image, use the @command{qemu-img} command: + +@example +qemu-img create -f qcow2 guixsd.img 5G +@end example + +This will create a 5GB file. + +@item +Boot the USB installation image in an VM: + +@example +qemu-system-x86_64 -m 1024 -smp 1 \ + -net default -net nic,model=virtio -boot menu=on \ + -drive file=guixsd.img \ + -drive file=guixsd-usb-install-@value{VERSION}.@var{system} +@end example + +In the VM console, quickly press the @kbd{F12} key to enter the boot +menu. Then press the @kbd{2} key and the @kbd{RET} key to validate your +selection. + +@item +You're now root in the VM, proceed with the installation process. +@xref{Preparing for Installation}, and follow the instructions. +@end enumerate + +Once installation is complete, you can boot the system that's on your +@file{guixsd.img} image. @xref{Running GuixSD in a VM}, for how to do +that. + @node Building the Installation Image @subsection Building the Installation Image @@ -7347,7 +7402,7 @@ read locale data produced with libc 2.22; worse, that program data@footnote{Versions 2.23 and later of GNU@tie{}libc will simply skip the incompatible locale data, which is already an improvement.}. Similarly, a program linked against libc 2.22 can read most, but not -all, the locale data from libc 2.21 (specifically, @code{LC_COLLATE} +all, of the locale data from libc 2.21 (specifically, @code{LC_COLLATE} data is incompatible); thus calls to @code{setlocale} may fail, but programs will not abort. @@ -7390,11 +7445,12 @@ Configuration System}). System services are typically daemons launched when the system boots, or other actions needed at that time---e.g., configuring network access. -Services are managed by the GNU@tie{}Shepherd (@pxref{Introduction,,, -shepherd, The GNU Shepherd Manual}). On a running system, the -@command{herd} command allows you to list the available services, show -their status, start and stop them, or do other specific operations -(@pxref{Jump Start,,, shepherd, The GNU Shepherd Manual}). For example: +GuixSD has a broad definition of ``service'' (@pxref{Service +Composition}), but many services are managed by the GNU@tie{}Shepherd +(@pxref{Shepherd Services}). On a running system, the @command{herd} +command allows you to list the available services, show their status, +start and stop them, or do other specific operations (@pxref{Jump +Start,,, shepherd, The GNU Shepherd Manual}). For example: @example # herd status @@ -7780,7 +7836,7 @@ gexps to introduce job definitions that are passed to mcron #~(job "5 0 * * *" ;Vixie cron syntax "guix gc -F 1G")) -(define idutils-jobs +(define idutils-job ;; Update the index database as user "charlie" at 12:15PM ;; and 19:15PM. This runs from the user's home directory. #~(job '(next-minute-from (next-hour '(12 19)) '(15)) @@ -7805,8 +7861,8 @@ list of gexps denoting mcron job specifications. This is a shorthand for: @example - (service mcron-service-type - (mcron-configuration (mcron mcron) (jobs jobs))) +(service mcron-service-type + (mcron-configuration (mcron mcron) (jobs jobs))) @end example @end deffn @@ -7816,7 +7872,7 @@ This is the type of the @code{mcron} service, whose value is an This service type can be the target of a service extension that provides it additional job specifications (@pxref{Service Composition}). In -other words, it is possible to define services that provide addition +other words, it is possible to define services that provide additional mcron jobs to run. @end defvr diff --git a/doc/htmlxref.cnf b/doc/htmlxref.cnf index 559cdce5aa..bd2eb5f147 100644 --- a/doc/htmlxref.cnf +++ b/doc/htmlxref.cnf @@ -1,7 +1,7 @@ # htmlxref.cnf - reference file for free Texinfo manuals on the web. # Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual. -htmlxrefversion=2016-03-30.07; # UTC +htmlxrefversion=2016-08-03.13; # UTC # Copyright 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc. # @@ -224,6 +224,9 @@ emacs-muse node ${GS}/emacs-muse/manual/html_node/ emms node ${GS}/emms/manual/ +# The file is called 'find.info' but the package is 'findutils'. +find mono ${GS}/findutils/manual/html_mono/find.html +find node ${GS}/findutils/manual/html_node/find_html findutils mono ${GS}/findutils/manual/html_mono/find.html findutils node ${GS}/findutils/manual/html_node/find_html @@ -468,6 +471,9 @@ mailutils node ${GS}/mailutils/manual/html_node/ make mono ${GS}/make/manual/make.html make node ${GS}/make/manual/html_node/ +mcron mono ${GS}/mcron/manual/mcron.html +mcron node ${GS}/mcron/manual/html_node/ + mdk mono ${GS}/mdk/manual/mdk.html mdk node ${GS}/mdk/manual/html_node/ |