From: Alex Kost <alezost@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 8/8] Replace "dmd" with "shepherd" in comments and strings.
Date: Mon, 25 Jan 2016 13:50:21 +0300 [thread overview]
Message-ID: <1453719021-13836-9-git-send-email-alezost@gmail.com> (raw)
In-Reply-To: <1453719021-13836-1-git-send-email-alezost@gmail.com>
* modules/shepherd/support.scm: Use "shepherd" instead of "dmd"
everywhere.
* configure.ac: Likewise.
* tests/no-home.sh: Likewise.
* tests/sigint.sh: Likewise.
---
configure.ac | 2 +-
modules/shepherd/support.scm | 16 ++++++++--------
tests/no-home.sh | 2 +-
tests/sigint.sh | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
index f89604c..478994c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ else
fi
AC_MSG_RESULT($recent_version)
if test $recent_version = no; then
- AC_MSG_WARN(your Guile is probably too old to run dmd)
+ AC_MSG_WARN(your Guile is probably too old to run shepherd)
fi
AC_PATH_PROG([GUILD], [guild])
diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
index aae8b3c..cd478ba 100644
--- a/modules/shepherd/support.scm
+++ b/modules/shepherd/support.scm
@@ -1,4 +1,4 @@
-;; support.scm -- Various support facilities, used by herd and dmd.
+;; support.scm -- Various support facilities, used by herd and shepherd.
;; Copyright (C) 2014 A.Sassmannshausen <alex.sassmannshausen@gmail.com>
;; Copyright (C) 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org>
;; Copyright (C) 2002, 2003 Wolfgang Jährling <wolfgang@pro-linux.de>
@@ -219,7 +219,7 @@ There is NO WARRANTY, to the extent permitted by law.")))
;; Home directory of the user.
(define user-homedir
;; Look for $HOME first, to allow users to override the defaults. This is
- ;; notably useful when dmd is built in a Guix chroot.
+ ;; notably useful when shepherd is built in a Guix chroot.
(or (getenv "HOME")
;; When bootstrapping and running as PID 1, /etc/{passwd,shadow} may be
@@ -240,17 +240,17 @@ TARGET should be a string representing a filepath + name."
(with-output-to-file target
(lambda ()
(display (string-append
- ";; init.scm -- default dmd configuration file.
+ ";; init.scm -- default shepherd configuration file.
-;; Services known to dmd:
-;; Add new services (defined using 'make <service>') to dmd here by
+;; Services known to shepherd:
+;; Add new services (defined using 'make <service>') to shepherd here by
;; providing them as arguments to 'register-services'.
""(register-services)
;; Send shepherd into the background
""(action 'shepherd 'daemonize)
-;; Services to start when dmd starts:
+;; Services to start when shepherd starts:
;; Add the name of each service that should be started to the list
;; below passed to 'for-each'.
""(for-each start '())
@@ -285,7 +285,7 @@ create a template configuration file if non exists."
%system-socket-dir
(string-append %user-config-dir "/run")))
-;; Unix domain socket for receiving commands in dmd.
+;; Unix domain socket for receiving commands in shepherd.
(define default-socket-file
(string-append default-socket-dir "/socket"))
@@ -299,7 +299,7 @@ create a template configuration file if non exists."
(string-append %localstatedir "/lib/shepherd/state")
(string-append %user-config-dir "/state")))
-;; Global variables set from (dmd).
+;; Global variables set from (shepherd).
(define persistency #f)
(define persistency-state-file default-persistency-state-file)
diff --git a/tests/no-home.sh b/tests/no-home.sh
index 32fa842..85b6116 100644
--- a/tests/no-home.sh
+++ b/tests/no-home.sh
@@ -35,7 +35,7 @@ herd="herd -s $socket"
trap "rm -f $socket;
test -f $pid && kill \`cat $pid\` || true; rm -f $pid" EXIT
-# Make sure 'dmd' starts even though $HOME is not writable.
+# Make sure 'shepherd' starts even though $HOME is not writable.
shepherd -I -s "$socket" -c /dev/null -l /dev/null --pid="$pid" &
shepherd_pid="$!"
diff --git a/tests/sigint.sh b/tests/sigint.sh
index 4c78ff7..253bf04 100644
--- a/tests/sigint.sh
+++ b/tests/sigint.sh
@@ -48,7 +48,7 @@ shepherd -I -s "$socket" -c "$conf" --pid="$pid" &
while [ ! -f "$pid" ] ; do sleep 0.5 ; done
-# Send SIGINT to dmd.
+# Send SIGINT to shepherd.
kill -INT "`cat "$pid"`"
while kill -0 "`cat "$pid"`" ; do sleep 0.5 ; done
--
2.6.3
next prev parent reply other threads:[~2016-01-25 10:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-25 10:50 [SHEPHERD] [PATCH 0/8]: More dmd -> shepherd patches Alex Kost
2016-01-25 10:50 ` [PATCH 1/8] tests: misbehaved-client: Rename 'dmd' to 'root' Alex Kost
2016-01-25 15:07 ` Ludovic Courtès
2016-01-25 10:50 ` [PATCH 2/8] tests: Rename 'dmd_pid' to 'shepherd_pid' Alex Kost
2016-01-25 15:07 ` Ludovic Courtès
2016-01-25 10:50 ` [PATCH 3/8] ChangeLog: Rename git repository Alex Kost
2016-01-25 15:07 ` Ludovic Courtès
2016-01-25 10:50 ` [PATCH 4/8] support: Rename 'make-dmd-user-module' to 'make-user-module' Alex Kost
2016-01-25 15:08 ` Ludovic Courtès
2016-01-25 10:50 ` [PATCH 5/8] Rename default system configuration file Alex Kost
2016-01-25 15:08 ` Ludovic Courtès
2016-01-25 10:50 ` [PATCH 6/8] support: Rename state file Alex Kost
2016-01-25 15:11 ` Ludovic Courtès
2016-01-25 19:26 ` Efraim Flashner
2016-01-25 19:36 ` Efraim Flashner
2016-01-25 10:50 ` [PATCH 7/8] utils: Rename 'dmd-gettext.scm' to 'shepherd-gettext.scm' Alex Kost
2016-01-25 15:12 ` Ludovic Courtès
2016-01-25 15:59 ` Alex Kost
2016-01-25 21:51 ` Ludovic Courtès
2016-01-26 9:42 ` Alex Kost
2016-01-25 10:50 ` Alex Kost [this message]
2016-01-25 15:13 ` [PATCH 8/8] Replace "dmd" with "shepherd" in comments and strings Ludovic Courtès
2016-01-25 16:14 ` Alex Kost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453719021-13836-9-git-send-email-alezost@gmail.com \
--to=alezost@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).