From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 8/8] Replace "dmd" with "shepherd" in comments and strings. Date: Mon, 25 Jan 2016 13:50:21 +0300 Message-ID: <1453719021-13836-9-git-send-email-alezost@gmail.com> References: <1453719021-13836-1-git-send-email-alezost@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNejv-0006gu-Nh for guix-devel@gnu.org; Mon, 25 Jan 2016 05:51:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNeju-0006yv-Dl for guix-devel@gnu.org; Mon, 25 Jan 2016 05:51:19 -0500 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:33033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNeju-0006ya-14 for guix-devel@gnu.org; Mon, 25 Jan 2016 05:51:18 -0500 Received: by mail-lf0-x242.google.com with SMTP id z62so7689640lfd.0 for ; Mon, 25 Jan 2016 02:51:17 -0800 (PST) Received: from localhost.localdomain ([217.107.192.146]) by smtp.gmail.com with ESMTPSA id p138sm2595299lfb.22.2016.01.25.02.51.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Jan 2016 02:51:16 -0800 (PST) In-Reply-To: <1453719021-13836-1-git-send-email-alezost@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * 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 ;; Copyright (C) 2013, 2014, 2016 Ludovic Courtès ;; Copyright (C) 2002, 2003 Wolfgang Jährling @@ -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 ') to dmd here by +;; Services known to shepherd: +;; Add new services (defined using 'make ') 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