summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2016-01-27 18:45:09 +0300
committerAlex Kost <alezost@gmail.com>2016-01-29 20:21:53 +0300
commitfe1ad5f5db1cf38a291ee5548729d24e03d3c448 (patch)
tree62236af0ad07c834fd3ff8721de22a5fe19b20e0
parent0190c1c02fd8cefa9642add58b4c7ccf75f082a7 (diff)
downloadguix-fe1ad5f5db1cf38a291ee5548729d24e03d3c448.tar.gz
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.
-rw-r--r--gnu/services/shepherd.scm12
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index a33985efa1..ccb71f35e1 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -55,13 +55,13 @@
 
 ;;; Commentary:
 ;;;
-;;; Instantiating system services as a dmd configuration file.
+;;; Instantiating system services as a shepherd configuration file.
 ;;;
 ;;; Code:
 
 
 (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
                 ;; Keep track of the booted system.
                 (false-if-exception (delete-file "/run/booted-system"))
@@ -79,7 +79,7 @@
 
                 ;; Start shepherd.
                 (execl (string-append #$shepherd "/bin/shepherd")
-                       "shepherd" "--config" #$dmd-conf)))))
+                       "shepherd" "--config" #$shepherd-conf)))))
 
 (define dmd-root-service-type
   (service-type
@@ -207,8 +207,8 @@ stored."
                     #:start #$(dmd-service-start service)
                     #:stop #$(dmd-service-stop service)))))
 
-(define (dmd-configuration-file services)
-  "Return the dmd configuration file for SERVICES."
+(define (shepherd-configuration-file services)
+  "Return the shepherd configuration file for SERVICES."
   (define modules
     (delete-duplicates
      (append-map dmd-service-imported-modules services)))
@@ -242,7 +242,7 @@ stored."
                                    (filter dmd-service-auto-start?
                                            services)))))
 
-    (gexp->file "dmd.conf" config)))
+    (gexp->file "shepherd.conf" config)))
 
 (define (dmd-service-back-edges services)
   "Return a procedure that, when given a <dmd-service> from SERVICES, returns