me
/
guix
Archived
1
0
Fork 0

services: base: Deprecate 'nscd-service' procedure.

* doc/guix.texi (Application Setup): Compress @cindex entries.
(Base Services): Compress @cindex entries. Delete %nscd-default-configuration.
Replace 'nscd-service' with 'nscd-service-type'.
* gnu/services/base.scm (%nscd-default-configuration): Deprecate variable.
(nscd-service): Deprecate procedure.
* gnu/system/install.scm (%installation-services): Use nscd-service-type.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Bruno Victal 2023-02-25 18:57:52 +00:00 committed by Ludovic Courtès
parent 5bd5e77281
commit 98e9dc6ab7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 17 additions and 25 deletions

View File

@ -1976,8 +1976,7 @@ versions may be incompatible.
@cindex name service switch, glibc @cindex name service switch, glibc
@cindex NSS (name service switch), glibc @cindex NSS (name service switch), glibc
@cindex nscd (name service caching daemon) @cindex @abbr{nscd, name service cache daemon}
@cindex name service caching daemon (nscd)
When using Guix on a foreign distro, we @emph{strongly recommend} that When using Guix on a foreign distro, we @emph{strongly recommend} that
the system run the GNU C library's @dfn{name service cache daemon}, the system run the GNU C library's @dfn{name service cache daemon},
@command{nscd}, which should be listening on the @command{nscd}, which should be listening on the
@ -18390,20 +18389,17 @@ The Kmscon package to use.
@end table @end table
@end deftp @end deftp
@cindex name service cache daemon @cindex @abbr{nscd, name service cache daemon}
@cindex nscd @defvar nscd-service-type
@deffn {Scheme Procedure} nscd-service [@var{config}] [#:glibc glibc] @ Type of the service that runs the libc @abbr{nscd, name service cache
[#:name-services '()] daemon}, whose value is a @code{<nscd-configuration>} object.
Return a service that runs the libc name service cache daemon (nscd) with the
given @var{config}---an @code{<nscd-configuration>} object. @xref{Name
Service Switch}, for an example.
For convenience, the Shepherd service for nscd provides the following actions: For convenience, the Shepherd service for nscd provides the following actions:
@table @code @table @code
@item invalidate @item invalidate
@cindex cache invalidation, nscd
@cindex nscd, cache invalidation @cindex nscd, cache invalidation
@cindex cache invalidation, nscd
This invalidate the given cache. For instance, running: This invalidate the given cache. For instance, running:
@example @example
@ -18417,17 +18413,10 @@ invalidates the host name lookup cache of nscd.
Running @command{herd statistics nscd} displays information about nscd usage Running @command{herd statistics nscd} displays information about nscd usage
and caches. and caches.
@end table @end table
@end deffn
@defvar %nscd-default-configuration
This is the default @code{<nscd-configuration>} value (see below) used
by @code{nscd-service}. It uses the caches defined by
@code{%nscd-default-caches}; see below.
@end defvar @end defvar
@deftp {Data Type} nscd-configuration @deftp {Data Type} nscd-configuration
This is the data type representing the name service cache daemon (nscd) Data type representing the @abbr{nscd, name service cache daemon}
configuration. configuration.
@table @asis @table @asis

View File

@ -177,7 +177,7 @@
mingetty-service-type mingetty-service-type
%nscd-default-caches %nscd-default-caches
%nscd-default-configuration %nscd-default-configuration ; deprecated
nscd-configuration nscd-configuration
nscd-configuration? nscd-configuration?
@ -186,7 +186,7 @@
nscd-cache? nscd-cache?
nscd-service-type nscd-service-type
nscd-service nscd-service ; deprecated
syslog-configuration syslog-configuration
syslog-configuration? syslog-configuration?
@ -1343,7 +1343,8 @@ the tty to run, among other things."
(check-files? #t) ;check /etc/services changes (check-files? #t) ;check /etc/services changes
(persistent? #t)))) (persistent? #t))))
(define %nscd-default-configuration (define-deprecated %nscd-default-configuration
#f
;; Default nscd configuration. ;; Default nscd configuration.
(nscd-configuration)) (nscd-configuration))
@ -1497,13 +1498,14 @@ the tty to run, among other things."
(name-services (append (name-services (append
(nscd-configuration-name-services config) (nscd-configuration-name-services config)
name-services))))) name-services)))))
(default-value %nscd-default-configuration) (default-value (nscd-configuration))
(description (description
"Runs libc's @dfn{name service cache daemon} (nscd) with the "Runs libc's @dfn{name service cache daemon} (nscd) with the
given configuration---an @code{<nscd-configuration>} object. @xref{Name given configuration---an @code{<nscd-configuration>} object. @xref{Name
Service Switch}, for an example."))) Service Switch}, for an example.")))
(define* (nscd-service #:optional (config %nscd-default-configuration)) (define-deprecated (nscd-service #:optional (config (nscd-configuration)))
nscd-service-type
"Return a service that runs libc's name service cache daemon (nscd) with the "Return a service that runs libc's name service cache daemon (nscd) with the
given @var{config}---an @code{<nscd-configuration>} object. @xref{Name given @var{config}---an @code{<nscd-configuration>} object. @xref{Name
Service Switch}, for an example." Service Switch}, for an example."

View File

@ -426,7 +426,8 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
;; Since this is running on a USB stick with a overlayfs as the root ;; Since this is running on a USB stick with a overlayfs as the root
;; file system, use an appropriate cache configuration. ;; file system, use an appropriate cache configuration.
(nscd-service (nscd-configuration (service nscd-service-type
(nscd-configuration
(caches %nscd-minimal-caches))) (caches %nscd-minimal-caches)))
;; Having /bin/sh is a good idea. In particular it allows Tramp ;; Having /bin/sh is a good idea. In particular it allows Tramp