services: etc-service: Deprecate etc-service procedure.
* gnu/services.scm (etc-service): Deprecate procedure. * gnu/system.scm (operating-system-etc-service): Replace etc-service with etc-service-type. Signed-off-by: Ludovic Courtès <ludo@gnu.org>master
parent
837e179e00
commit
93918c67c5
|
@ -39,6 +39,7 @@
|
||||||
#:use-module (guix modules)
|
#:use-module (guix modules)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
|
#:use-module (guix deprecation)
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages bash)
|
#:use-module (gnu packages bash)
|
||||||
#:use-module (gnu packages hurd)
|
#:use-module (gnu packages hurd)
|
||||||
|
@ -122,7 +123,7 @@
|
||||||
|
|
||||||
%boot-service
|
%boot-service
|
||||||
%activation-service
|
%activation-service
|
||||||
etc-service)
|
etc-service) ; deprecated
|
||||||
#:re-export (;; Note: Re-export 'delete' to allow for proper syntax matching
|
#:re-export (;; Note: Re-export 'delete' to allow for proper syntax matching
|
||||||
;; in 'modify-services' forms. See
|
;; in 'modify-services' forms. See
|
||||||
;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26805#16>.
|
;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26805#16>.
|
||||||
|
@ -804,7 +805,8 @@ directory."
|
||||||
(extend append)
|
(extend append)
|
||||||
(description "Populate the @file{/etc} directory.")))
|
(description "Populate the @file{/etc} directory.")))
|
||||||
|
|
||||||
(define (etc-service files)
|
(define-deprecated (etc-service files)
|
||||||
|
etc-service-type
|
||||||
"Return a new service of ETC-SERVICE-TYPE that populates /etc with FILES.
|
"Return a new service of ETC-SERVICE-TYPE that populates /etc with FILES.
|
||||||
FILES must be a list of name/file-like object pairs."
|
FILES must be a list of name/file-like object pairs."
|
||||||
(service etc-service-type files))
|
(service etc-service-type files))
|
||||||
|
|
|
@ -1090,7 +1090,7 @@ then
|
||||||
# as those in ~/.guix-profile and /run/current-system/profile.
|
# as those in ~/.guix-profile and /run/current-system/profile.
|
||||||
source /run/current-system/profile/etc/profile.d/bash_completion.sh
|
source /run/current-system/profile/etc/profile.d/bash_completion.sh
|
||||||
fi\n")))
|
fi\n")))
|
||||||
(etc-service
|
(service etc-service-type
|
||||||
`(("os-release" ,os-release)
|
`(("os-release" ,os-release)
|
||||||
("services" ,(file-append net-base "/etc/services"))
|
("services" ,(file-append net-base "/etc/services"))
|
||||||
("protocols" ,(file-append net-base "/etc/protocols"))
|
("protocols" ,(file-append net-base "/etc/protocols"))
|
||||||
|
|
Reference in New Issue