services: Rename 'dmd' services to 'shepherd'.

* gnu/services/shepherd.scm (dmd-root-service-type, %dmd-root-service)
  (dmd-service-type, <dmd-service>, dmd-service, dmd-service?)
  (make-dmd-service, dmd-service-documentation, dmd-service-provision)
  (dmd-service-requirement, dmd-service-respawn, dmd-service-start)
  (dmd-service-stop, dmd-service-auto-start?, dmd-service-modules)
  (dmd-service-imported-modules, dmd-service-file-name, dmd-service-file)
  (dmd-service-back-edges): Rename to...
  (shepherd-root-service-type, %shepherd-root-service, shepherd-service-type)
  (<shepherd-service>, shepherd-service, shepherd-service?)
  (make-shepherd-service, shepherd-service-documentation)
  (shepherd-service-provision, shepherd-service-requirement)
  (shepherd-service-respawn, shepherd-service-start)
  (shepherd-service-stop, shepherd-service-auto-start?)
  (shepherd-service-modules, shepherd-service-imported-modules)
  (shepherd-service-file-name, shepherd-service-file)
  (shepherd-service-back-edges): ...this
* gnu/services.scm: Adjust comments.
* gnu/services/avahi.scm (avahi-dmd-service): Rename to...
  (avahi-shepherd-service): ... this.
* gnu/services/base.scm (%root-file-system-dmd-service)
  (file-system->dmd-service-name, mapped-device->dmd-service-name)
  (dependency->dmd-service-name, file-system-dmd-service)
  (mingetty-dmd-service, nscd-dmd-service, guix-dmd-service)
  (guix-publish-dmd-service, udev-dmd-service, gpm-dmd-service): Rename to...
  (%root-file-system-shepherd-service)
  (file-system->shepherd-service-name, mapped-device->shepherd-service-name)
  (dependency->shepherd-service-name, file-system-shepherd-service)
  (mingetty-shepherd-service, nscd-shepherd-service, guix-shepherd-service)
  (guix-publish-shepherd-service, udev-shepherd-service)
  (gpm-shepherd-service): ... this.
* gnu/services/databases.scm (postgresql-dmd-service): Rename to...
  (postgresql-shepherd-service): ... this.
* gnu/services/desktop.scm (upower-dmd-service, elogind-dmd-service):
  Rename to...
  (upower-shepherd-service, elogind-shepherd-service): ... this.
* gnu/services/dbus.scm (dbus-dmd-service): Rename to...
  (dbus-shepherd-service): ... this.
* gnu/services/lirc.scm (lirc-dmd-service): Rename to...
  (lirc-shepherd-service): ... this.
* gnu/services/mail.scm (dovecot-dmd-service): Rename to...
  (dovecot-shepherd-service): ... this.
* gnu/services/networking.scm (ntp-dmd-service, tor-dmd-service)
  (bitlbee-dmd-service, wicd-dmd-service, network-manager-dmd-service): Rename to...
  (dbus-shepherd-service): ... this.
* gnu/services/ssh.scm (lsh-dmd-service): Rename to...
  (lsh-shepherd-service): ... this.
* gnu/services/web.scm (nginx-dmd-service): Rename to...
  (nginx-shepherd-service): ... this.
* gnu/services/xorg.scm (slim-dmd-service): Rename to...
  (slim-shepherd-service): ... this.
* gnu/system.scm (essential-services): Use '%shepherd-root-service'.
* gnu/system/install.scm (cow-store-service-type): Adjust accordingly.
* guix/scripts/system.scm (dmd-service-node-label, dmd-service-node-type)
  (export-dmd-graph): Likewise.
* tests/guix-system.sh: Likewise.
* tests/services.scm ("dmd-service-back-edges"): Rename to...
  ("shepherd-service-back-edges"): Adjust accordingly.
* doc/guix.texi: Likewise.
* doc/images/service-graph.dot: Use 'shepherd' service name.

1 files changed, 12 insertions, 12 deletions

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 3f368ca55f..b0f8be74b0 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -313,17 +313,17 @@ list of services."
    (edges (lift1 (service-back-edges services) %store-monad))))
 
 (define (dmd-service-node-label service)
-  "Return a label for a node representing a <dmd-service>."
-  (string-join (map symbol->string (dmd-service-provision service))))
+  "Return a label for a node representing a <shepherd-service>."
+  (string-join (map symbol->string (shepherd-service-provision service))))
 
 (define (dmd-service-node-type services)
-  "Return a node type for SERVICES, a list of <dmd-service>."
+  "Return a node type for SERVICES, a list of <shepherd-service>."
   (node-type
    (name "dmd-service")
    (description "the dependency graph of dmd services")
    (identifier (lift1 dmd-service-node-label %store-monad))
    (label dmd-service-node-label)
-   (edges (lift1 (dmd-service-back-edges services) %store-monad))))
+   (edges (lift1 (shepherd-service-back-edges services) %store-monad))))
 
 
 ;;;
@@ -475,14 +475,14 @@ building anything."
                   #:reverse-edges? #t)))
 
 (define (export-dmd-graph os port)
-  "Export the graph of dmd services of OS to PORT."
-  (let* ((services (operating-system-services os))
-         (pid1     (fold-services services
-                                  #:target-type dmd-root-service-type))
-         (dmds     (service-parameters pid1))     ;the list of <dmd-service>
-         (sinks    (filter (lambda (service)
-                             (null? (dmd-service-requirement service)))
-                           dmds)))
+  "Export the graph of shepherd services of OS to PORT."
+  (let* ((services  (operating-system-services os))
+         (pid1      (fold-services services
+                                   #:target-type shepherd-root-service-type))
+         (shepherds (service-parameters pid1)) ;list of <shepherd-service>
+         (sinks     (filter (lambda (service)
+                              (null? (shepherd-service-requirement service)))
+                            shepherds)))
     (export-graph sinks (current-output-port)
                   #:node-type (dmd-service-node-type dmds)
                   #:reverse-edges? #t)))