Browse Source

Rename (gnu services dmd) to (gnu services shepherd).

* gnu/services/dmd.scm: Rename to...
* gnu/services/shepherd.scm: ... this.
* gnu/system.scm: Use it.
* gnu/system/install.scm: Likewise.
* gnu/services/xorg.scm: Likewise.
* gnu/services/web.scm: Likewise.
* gnu/services/ssh.scm: Likewise.
* gnu/services/networking.scm: Likewise.
* gnu/services/mail.scm: Likewise.
* gnu/services/lirc.scm: Likewise.
* gnu/services/desktop.scm: Likewise.
* gnu/services/dbus.scm: Likewise.
* gnu/services/databases.scm: Likewise.
* gnu/services/base.scm: Likewise.
* gnu/services/avahi.scm: Likewise.
* guix/scripts/system.scm: Likewise.
* tests/services.scm: Likewise.
* tests/guix-system.sh: Likewise.
* doc/guix.texi (Shepherd Services): Adjust accordingly.
* gnu-system.am (GNU_SYSTEM_MODULES): Likewise.
* po/guix/POTFILES.in: Likewise.
wip-mediagoblin
Alex Kost 6 years ago
parent
commit
0190c1c02f
  1. 9
      doc/guix.texi
  2. 2
      gnu-system.am
  3. 2
      gnu/services/avahi.scm
  4. 2
      gnu/services/base.scm
  5. 2
      gnu/services/databases.scm
  6. 2
      gnu/services/dbus.scm
  7. 2
      gnu/services/desktop.scm
  8. 2
      gnu/services/lirc.scm
  9. 2
      gnu/services/mail.scm
  10. 2
      gnu/services/networking.scm
  11. 4
      gnu/services/shepherd.scm
  12. 2
      gnu/services/ssh.scm
  13. 2
      gnu/services/web.scm
  14. 2
      gnu/services/xorg.scm
  15. 2
      gnu/system.scm
  16. 2
      gnu/system/install.scm
  17. 2
      guix/scripts/system.scm
  18. 2
      po/guix/POTFILES.in
  19. 4
      tests/guix-system.sh
  20. 2
      tests/services.scm

9
doc/guix.texi

@ -9783,10 +9783,11 @@ extend it by passing it lists of packages to add to the system profile.
@cindex PID 1
@cindex init system
The @code{(gnu services dmd)} provides a way to define services managed
by the GNU@tie{}Shepherd, which is GuixSD initialization system---the
first process that is started when the system boots, aka. PID@tie{}1
(@pxref{Introduction,,, shepherd, The GNU Shepherd Manual}).
The @code{(gnu services shepherd)} provides a way to define services
managed by the GNU@tie{}Shepherd, which is GuixSD initialization
system---the first process that is started when the system boots,
aka. PID@tie{}1 (@pxref{Introduction,,, shepherd, The GNU Shepherd
Manual}).
Services in the Shepherd can depend on each other. For instance, the
SSH daemon may need to be started after the syslog daemon has been

2
gnu-system.am

@ -362,10 +362,10 @@ GNU_SYSTEM_MODULES = \
gnu/services/databases.scm \
gnu/services/dbus.scm \
gnu/services/desktop.scm \
gnu/services/dmd.scm \
gnu/services/lirc.scm \
gnu/services/mail.scm \
gnu/services/networking.scm \
gnu/services/shepherd.scm \
gnu/services/ssh.scm \
gnu/services/web.scm \
gnu/services/xorg.scm \

2
gnu/services/avahi.scm

@ -19,7 +19,7 @@
(define-module (gnu services avahi)
#:use-module (gnu services)
#:use-module (gnu services base)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu services dbus)
#:use-module (gnu system shadow)
#:use-module (gnu packages avahi)

2
gnu/services/base.scm

@ -22,7 +22,7 @@
(define-module (gnu services base)
#:use-module (guix store)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu services networking)
#:use-module (gnu system pam)
#:use-module (gnu system shadow) ; 'user-account', etc.

2
gnu/services/databases.scm

@ -19,7 +19,7 @@
(define-module (gnu services databases)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu system shadow)
#:use-module (gnu packages admin)
#:use-module (gnu packages databases)

2
gnu/services/dbus.scm

@ -19,7 +19,7 @@
(define-module (gnu services dbus)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu system shadow)
#:use-module ((gnu packages glib) #:select (dbus/activation))
#:use-module (gnu packages admin)

2
gnu/services/desktop.scm

@ -20,7 +20,7 @@
(define-module (gnu services desktop)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu services base)
#:use-module (gnu services dbus)
#:use-module (gnu services avahi)

2
gnu/services/lirc.scm

@ -19,7 +19,7 @@
(define-module (gnu services lirc)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu packages lirc)
#:use-module (guix gexp)
#:use-module (guix records)

2
gnu/services/mail.scm

@ -21,7 +21,7 @@
(define-module (gnu services mail)
#:use-module (gnu services)
#:use-module (gnu services base)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu system pam)
#:use-module (gnu system shadow)
#:use-module (gnu packages mail)

2
gnu/services/networking.scm

@ -19,7 +19,7 @@
(define-module (gnu services networking)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu services dbus)
#:use-module (gnu system shadow)
#:use-module (gnu system pam)

4
gnu/services/dmd.scm → gnu/services/shepherd.scm

@ -16,7 +16,7 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu services dmd)
(define-module (gnu services shepherd)
#:use-module (guix ui)
#:use-module (guix sets)
#:use-module (guix gexp)
@ -272,4 +272,4 @@ the list of <dmd-service> that depend on it."
(lambda (service)
(vhash-foldq* cons '() service edges)))
;;; dmd.scm ends here
;;; shepherd.scm ends here

2
gnu/services/ssh.scm

@ -20,7 +20,7 @@
#:use-module (guix gexp)
#:use-module (guix records)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu system pam)
#:use-module (gnu packages lsh)
#:use-module (srfi srfi-26)

2
gnu/services/web.scm

@ -19,7 +19,7 @@
(define-module (gnu services web)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu system shadow)
#:use-module (gnu packages admin)
#:use-module (gnu packages web)

2
gnu/services/xorg.scm

@ -20,7 +20,7 @@
(define-module (gnu services xorg)
#:use-module (gnu artwork)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu system pam)
#:use-module ((gnu packages base) #:select (canonical-package))
#:use-module (gnu packages guile)

2
gnu/system.scm

@ -44,7 +44,7 @@
#:use-module (gnu packages firmware)
#:autoload (gnu packages cryptsetup) (cryptsetup)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu services base)
#:use-module (gnu system grub)
#:use-module (gnu system shadow)

2
gnu/system/install.scm

@ -24,7 +24,7 @@
#:use-module (guix monads)
#:use-module ((guix store) #:select (%store-prefix))
#:use-module (guix profiles)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu packages admin)
#:use-module (gnu packages bash)
#:use-module (gnu packages linux)

2
guix/scripts/system.scm

@ -40,7 +40,7 @@
#:use-module (gnu system vm)
#:use-module (gnu system grub)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (gnu packages grub)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-19)

2
po/guix/POTFILES.in

@ -3,7 +3,7 @@
gnu/packages.scm
gnu/services.scm
gnu/system.scm
gnu/services/dmd.scm
gnu/services/shepherd.scm
gnu/system/shadow.scm
guix/scripts.scm
guix/scripts/build.scm

4
tests/guix-system.sh

@ -114,10 +114,10 @@ else
grep "service 'networking'.*more than once" "$errorfile"
fi
# Reporting unmet dmd requirements.
# Reporting unmet shepherd requirements.
cat > "$tmpfile" <<EOF
(use-modules (gnu) (gnu services dmd))
(use-modules (gnu) (gnu services shepherd))
(use-service-modules networking)
(define buggy-service-type

2
tests/services.scm

@ -18,7 +18,7 @@
(define-module (test-services)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services shepherd)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)

Loading…
Cancel
Save