nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Alex Kost 2016-01-27 15:45:01 +03:00
parent dd17bc3821
commit 0190c1c02f
20 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/guix.texi
View File

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

2
gnu-system.am
View File

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

2
gnu/services/avahi.scm
View File

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

2
gnu/services/base.scm
View File

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

2
gnu/services/databases.scm
View File

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

2
gnu/services/dbus.scm
View File

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

2
gnu/services/desktop.scm
View File

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

2
gnu/services/lirc.scm
View File

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

2
gnu/services/mail.scm
View File

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

2
gnu/services/networking.scm
View File

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

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

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

2
gnu/services/ssh.scm
View File

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

2
gnu/services/web.scm
View File

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

2
gnu/services/xorg.scm
View File

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

2
gnu/system.scm
View File

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

2
gnu/system/install.scm
View File

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

2
guix/scripts/system.scm
View File

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

2
po/guix/POTFILES.in
View File

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

4
tests/guix-system.sh
View File

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

2
tests/services.scm
View File

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