nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: shepherd: Rename shepherd configuration file. 

* gnu/services/shepherd.scm (dmd-configuration-file): Rename to...
  (shepherd-configuration-file): ... this.  Use "shepherd.conf" name.
  (dmd-boot-gexp): Use it.
This commit is contained in:
Alex Kost 2016-01-27 18:45:09 +03:00
parent 0190c1c02f
commit fe1ad5f5db
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/services/shepherd.scm
View File

@ -55,13 +55,13 @@
;;; Commentary: ;;; Commentary:
;;; ;;;
;;; Instantiating system services as a dmd configuration file. ;;; Instantiating system services as a shepherd configuration file.
;;; ;;;
;;; Code: ;;; Code:
(define (dmd-boot-gexp services) (define (dmd-boot-gexp services)
(mlet %store-monad ((dmd-conf (dmd-configuration-file services))) (mlet %store-monad ((shepherd-conf (shepherd-configuration-file services)))
(return #~(begin (return #~(begin
;; Keep track of the booted system. ;; Keep track of the booted system.
(false-if-exception (delete-file "/run/booted-system")) (false-if-exception (delete-file "/run/booted-system"))
@ -79,7 +79,7 @@
;; Start shepherd. ;; Start shepherd.
(execl (string-append #$shepherd "/bin/shepherd") (execl (string-append #$shepherd "/bin/shepherd")
"shepherd" "--config" #$dmd-conf))))) "shepherd" "--config" #$shepherd-conf)))))
(define dmd-root-service-type (define dmd-root-service-type
(service-type (service-type
@ -207,8 +207,8 @@ stored."
#:start #$(dmd-service-start service) #:start #$(dmd-service-start service)
#:stop #$(dmd-service-stop service))))) #:stop #$(dmd-service-stop service)))))
(define (dmd-configuration-file services) (define (shepherd-configuration-file services)
"Return the dmd configuration file for SERVICES." "Return the shepherd configuration file for SERVICES."
(define modules (define modules
(delete-duplicates (delete-duplicates
(append-map dmd-service-imported-modules services))) (append-map dmd-service-imported-modules services)))
@ -242,7 +242,7 @@ stored."
(filter dmd-service-auto-start? (filter dmd-service-auto-start?
services))))) services)))))
(gexp->file "dmd.conf" config))) (gexp->file "shepherd.conf" config)))
(define (dmd-service-back-edges services) (define (dmd-service-back-edges services)
"Return a procedure that, when given a <dmd-service> from SERVICES, returns "Return a procedure that, when given a <dmd-service> from SERVICES, returns