diff options
author | Alex Kost <alezost@gmail.com> | 2016-01-27 23:02:31 +0300 |
---|---|---|
committer | Alex Kost <alezost@gmail.com> | 2016-01-29 20:21:53 +0300 |
commit | d4053c710bc2c7a4f624ba2d72438d8f289ad569 (patch) | |
tree | a07276cb148dbb778082b9986940a5d69ac830b0 /gnu/services/desktop.scm | |
parent | 26b94866ad18666e1e427f3377ad21b8532cc3fb (diff) | |
download | guix-d4053c710bc2c7a4f624ba2d72438d8f289ad569.tar guix-d4053c710bc2c7a4f624ba2d72438d8f289ad569.tar.gz |
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.
Diffstat (limited to 'gnu/services/desktop.scm')
-rw-r--r-- | gnu/services/desktop.scm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index e6d323270e..9d6abc3867 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -165,11 +165,11 @@ is set to @var{value} when the bus daemon launches it." "UPOWER_CONF_FILE_NAME" (upower-configuration-file config)))) -(define (upower-dmd-service config) - "Return a dmd service for UPower with CONFIG." +(define (upower-shepherd-service config) + "Return a shepherd service for UPower with CONFIG." (let ((upower (upower-configuration-upower config)) (config (upower-configuration-file config))) - (list (dmd-service + (list (shepherd-service (documentation "Run the UPower power and battery monitor.") (provision '(upower-daemon)) (requirement '(dbus-system udev)) @@ -186,8 +186,8 @@ is set to @var{value} when the bus daemon launches it." (extensions (list (service-extension dbus-root-service-type upower-dbus-service) - (service-extension dmd-root-service-type - upower-dmd-service) + (service-extension shepherd-root-service-type + upower-shepherd-service) (service-extension activation-service-type (const %upower-activation)) (service-extension udev-service-type @@ -644,13 +644,13 @@ include the @command{udisksctl} command, part of UDisks, and GNOME Disks." ("HybridSleepState" (sleep-list elogind-hybrid-sleep-state)) ("HybridSleepMode" (sleep-list elogind-hybrid-sleep-mode)))) -(define (elogind-dmd-service config) - "Return a dmd service for elogind, using @var{config}." +(define (elogind-shepherd-service config) + "Return a shepherd service for elogind, using @var{config}." ;; TODO: We could probably rely on service activation but the '.service' ;; file currently contains an erroneous 'Exec' line. (let ((config-file (elogind-configuration-file config)) (elogind (elogind-package config))) - (list (dmd-service + (list (shepherd-service (documentation "Run the elogind login and seat management service.") (provision '(elogind)) (requirement '(dbus-system)) @@ -664,8 +664,8 @@ include the @command{udisksctl} command, part of UDisks, and GNOME Disks." (define elogind-service-type (service-type (name 'elogind) (extensions - (list (service-extension dmd-root-service-type - elogind-dmd-service) + (list (service-extension shepherd-root-service-type + elogind-shepherd-service) (service-extension dbus-root-service-type (compose list elogind-package)) (service-extension udev-service-type |