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 /tests | |
parent | 26b94866ad18666e1e427f3377ad21b8532cc3fb (diff) | |
download | gnu-guix-d4053c710bc2c7a4f624ba2d72438d8f289ad569.tar gnu-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 'tests')
-rw-r--r-- | tests/guix-system.sh | 4 | ||||
-rw-r--r-- | tests/services.scm | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/tests/guix-system.sh b/tests/guix-system.sh index cd135b9a88..d9e1679ae7 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -121,10 +121,10 @@ cat > "$tmpfile" <<EOF (use-service-modules networking) (define buggy-service-type - (dmd-service-type + (shepherd-service-type 'buggy (lambda _ - (dmd-service + (shepherd-service (provision '(buggy!)) (requirement '(does-not-exist)) (start #t))))) diff --git a/tests/services.scm b/tests/services.scm index ab8f293c43..3635549077 100644 --- a/tests/services.scm +++ b/tests/services.scm @@ -105,11 +105,15 @@ (fold-services (list s) #:target-type t1) #f))) -(test-assert "dmd-service-back-edges" - (let* ((s1 (dmd-service (provision '(s1)) (start #f))) - (s2 (dmd-service (provision '(s2)) (requirement '(s1)) (start #f))) - (s3 (dmd-service (provision '(s3)) (requirement '(s1 s2)) (start #f))) - (e (dmd-service-back-edges (list s1 s2 s3)))) +(test-assert "shepherd-service-back-edges" + (let* ((s1 (shepherd-service (provision '(s1)) (start #f))) + (s2 (shepherd-service (provision '(s2)) + (requirement '(s1)) + (start #f))) + (s3 (shepherd-service (provision '(s3)) + (requirement '(s1 s2)) + (start #f))) + (e (shepherd-service-back-edges (list s1 s2 s3)))) (and (lset= eq? (e s1) (list s2 s3)) (lset= eq? (e s2) (list s3)) (null? (e s3))))) |