diff options
| author | Bruno Victal <mirai@makinata.eu> | 2023-03-13 17:36:14 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-03-16 12:37:03 +0100 |
| commit | 93918c67c5761d8f688cda5f5b49d5c49c7626d0 (patch) | |
| tree | a700831e69b818491708f4f434cdf5738623f74f /gnu | |
| parent | 837e179e009cd55acc03193e5600fb0a8eb60e6b (diff) | |
| download | guix-93918c67c5761d8f688cda5f5b49d5c49c7626d0.tar.gz guix-93918c67c5761d8f688cda5f5b49d5c49c7626d0.zip | |
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>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services.scm | 6 | ||||
| -rw-r--r-- | gnu/system.scm | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gnu/services.scm b/gnu/services.scm index 2abef557d4..d6c7ad0553 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -39,6 +39,7 @@ #:use-module (guix modules) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix deprecation) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages hurd) @@ -122,7 +123,7 @@ %boot-service %activation-service - etc-service) + etc-service) ; deprecated #:re-export (;; Note: Re-export 'delete' to allow for proper syntax matching ;; in 'modify-services' forms. See ;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26805#16>. @@ -804,7 +805,8 @@ directory." (extend append) (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. FILES must be a list of name/file-like object pairs." (service etc-service-type files)) diff --git a/gnu/system.scm b/gnu/system.scm index 887e537b48..48cc68f449 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1090,7 +1090,7 @@ then # as those in ~/.guix-profile and /run/current-system/profile. source /run/current-system/profile/etc/profile.d/bash_completion.sh fi\n"))) - (etc-service + (service etc-service-type `(("os-release" ,os-release) ("services" ,(file-append net-base "/etc/services")) ("protocols" ,(file-append net-base "/etc/protocols")) |