summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/guix-cookbook.texi2
-rw-r--r--doc/guix.texi18
2 files changed, 9 insertions, 11 deletions
diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi
index 1970eb7dbb2..108d5a61e97 100644
--- a/doc/guix-cookbook.texi
+++ b/doc/guix-cookbook.texi
@@ -3332,7 +3332,7 @@ is below. Save the resulting file as @file{guix-config.scm}.
3332 %base-packages)) 3332 %base-packages))
3333 3333
3334 (services (cons* 3334 (services (cons*
3335 (service dhcp-client-service-type) 3335 (service dhcpcd-service-type)
3336 (service openssh-service-type 3336 (service openssh-service-type
3337 (openssh-configuration 3337 (openssh-configuration
3338 (openssh openssh-sans-x) 3338 (openssh openssh-sans-x)
diff --git a/doc/guix.texi b/doc/guix.texi
index d3736a38fe7..ea49e80e27c 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19228,7 +19228,7 @@ As an example, an NFS file system would typically have a requirement for
19228might not be sufficient as @code{networking} being marked as started 19228might not be sufficient as @code{networking} being marked as started
19229does @emph{not} imply the network has already been configured and in 19229does @emph{not} imply the network has already been configured and in
19230working order (for example, when using 19230working order (for example, when using
19231@code{dhcp-client-service-type}). For such cases, adding a 19231@code{dhcpcd-service-type}). For such cases, adding a
19232requirement on a custom @code{network-online} service may be necessary. 19232requirement on a custom @code{network-online} service may be necessary.
19233A sample @code{network-online} one-shot Shepherd service implementation 19233A sample @code{network-online} one-shot Shepherd service implementation
19234is provided below: 19234is provided below:
@@ -22812,9 +22812,7 @@ which provides the @code{networking} Shepherd service.
22812 22812
22813@defvar dhcpcd-service-type 22813@defvar dhcpcd-service-type
22814This the type for a service running @command{dhcpcd}, a @acronym{DHCP, 22814This the type for a service running @command{dhcpcd}, a @acronym{DHCP,
22815Dynamic Host Configuration Protocol} client that can be used as a 22815Dynamic Host Configuration Protocol} client.
22816replacement for the historical ISC client supported by
22817@code{dhcp-client-service-type}.
22818 22816
22819Its value must be a @code{dhcpcd-configuration} record, as described 22817Its value must be a @code{dhcpcd-configuration} record, as described
22820below. As an example, consider the following setup which runs 22818below. As an example, consider the following setup which runs
@@ -23311,7 +23309,7 @@ required to authenticate against encrypted WiFi networks.
23311 23309
23312@quotation Warning 23310@quotation Warning
23313By default @code{iwd} removes and re-creates interfaces it manages. It 23311By default @code{iwd} removes and re-creates interfaces it manages. It
23314doesn't play nicely with @code{dhcp-client-service-type} that enumerates 23312doesn't play nicely with @code{dhcpcd-service-type} that enumerates
23315wireless interfaces before starting the Shepherd service. Use either 23313wireless interfaces before starting the Shepherd service. Use either
23316@code{dhcpcd-service-type} or the @code{iwd}'s built-in DHCP client (see 23314@code{dhcpcd-service-type} or the @code{iwd}'s built-in DHCP client (see
23317@code{enable-network-configuration} option below). 23315@code{enable-network-configuration} option below).
@@ -35099,7 +35097,7 @@ consults the @code{ldap} name service last:
35099 (services 35097 (services
35100 (cons* 35098 (cons*
35101 (service nslcd-service-type) 35099 (service nslcd-service-type)
35102 (service dhcp-client-service-type) 35100 (service dhcpcd-service-type)
35103 %base-services)) 35101 %base-services))
35104 (name-service-switch 35102 (name-service-switch
35105 (let ((services (list (name-service (name "db")) 35103 (let ((services (list (name-service (name "db"))
@@ -37104,7 +37102,7 @@ A helper function to quickly add php to an @code{nginx-server-configuration}.
37104 37102
37105A simple services setup for nginx with php can look like this: 37103A simple services setup for nginx with php can look like this:
37106@lisp 37104@lisp
37107(services (cons* (service dhcp-client-service-type) 37105(services (cons* (service dhcpcd-service-type)
37108 (service php-fpm-service-type) 37106 (service php-fpm-service-type)
37109 (service nginx-service-type 37107 (service nginx-service-type
37110 (nginx-server-configuration 37108 (nginx-server-configuration
@@ -50507,7 +50505,7 @@ evaluates to. As an example, @var{file} might contain a definition like this:
50507 (type "ext4")) 50505 (type "ext4"))
50508 %base-file-systems)) 50506 %base-file-systems))
50509 (services 50507 (services
50510 (append (list (service dhcp-client-service-type) 50508 (append (list (service dhcpcd-service-type)
50511 (service openssh-service-type 50509 (service openssh-service-type
50512 (openssh-configuration 50510 (openssh-configuration
50513 (permit-root-login #t) 50511 (permit-root-login #t)
@@ -50942,7 +50940,7 @@ the backing store of the ``myhd'' drive.
50942 50940
50943The default @command{run-vm.sh} script that is returned by an invocation of 50941The default @command{run-vm.sh} script that is returned by an invocation of
50944@command{guix system vm} does not add a @command{-nic user} flag by default. 50942@command{guix system vm} does not add a @command{-nic user} flag by default.
50945To get network access from within the vm add the @code{(dhcp-client-service)} 50943To get network access from within the vm add the @code{(dhcpcd-service-type)}
50946to your system definition and start the VM using 50944to your system definition and start the VM using
50947@command{$(guix system vm config.scm) -nic user}. An important caveat of using 50945@command{$(guix system vm config.scm) -nic user}. An important caveat of using
50948@command{-nic user} for networking is that @command{ping} will not work, because 50946@command{-nic user} for networking is that @command{ping} will not work, because
@@ -50978,7 +50976,7 @@ connection to an unknown host every time you connect.
50978If you find the above @samp{hostfwd} example not to be working (e.g., 50976If you find the above @samp{hostfwd} example not to be working (e.g.,
50979your SSH client hangs attempting to connect to the mapped port of your 50977your SSH client hangs attempting to connect to the mapped port of your
50980VM), make sure that your Guix System VM has networking support, such as 50978VM), make sure that your Guix System VM has networking support, such as
50981by using the @code{dhcp-client-service-type} service type. 50979by using the @code{dhcpcd-service-type} service type.
50982@end quotation 50980@end quotation
50983 50981
50984@subsection Using @command{virt-viewer} with Spice 50982@subsection Using @command{virt-viewer} with Spice