From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 5/8] Rename default system configuration file. Date: Mon, 25 Jan 2016 13:50:18 +0300 Message-ID: <1453719021-13836-6-git-send-email-alezost@gmail.com> References: <1453719021-13836-1-git-send-email-alezost@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNejs-0006at-Ms for guix-devel@gnu.org; Mon, 25 Jan 2016 05:51:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNejr-0006xX-Oc for guix-devel@gnu.org; Mon, 25 Jan 2016 05:51:16 -0500 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:35790) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNejr-0006xR-Gf for guix-devel@gnu.org; Mon, 25 Jan 2016 05:51:15 -0500 Received: by mail-lf0-x241.google.com with SMTP id c134so7834752lfb.2 for ; Mon, 25 Jan 2016 02:51:15 -0800 (PST) Received: from localhost.localdomain ([217.107.192.146]) by smtp.gmail.com with ESMTPSA id p138sm2595299lfb.22.2016.01.25.02.51.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Jan 2016 02:51:14 -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 (default-config-file): Rename "dmdconf.scm" to "shepherd.conf.scm". * shepherd.texi (Jump Start): Likewise. --- modules/shepherd/support.scm | 2 +- shepherd.texi | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm index 562a87b..f161056 100644 --- a/modules/shepherd/support.scm +++ b/modules/shepherd/support.scm @@ -268,7 +268,7 @@ TARGET should be a string representing a filepath + name." global system configuration file when running as 'root'. As a side effect, create a template configuration file if non exists." (if (zero? (getuid)) - (string-append %sysconfdir "/dmdconf.scm") + (string-append %sysconfdir "/shepherd.conf.scm") (let ((config-file (string-append %user-config-dir "/init.scm"))) (mkdir-p %user-config-dir #o700) (if (not (file-exists? config-file)) diff --git a/shepherd.texi b/shepherd.texi index 74cf584..29fbe02 100644 --- a/shepherd.texi +++ b/shepherd.texi @@ -141,7 +141,7 @@ mentioned below. @cindex Configuration file When @command{shepherd} gets started, it reads and evaluates a configuration file. When it is started with superuser priviledges, it -tries to use @code{/etc/dmdconf.scm}. When started as normal user, it +tries to use @code{/etc/shepherd.conf.scm}. When started as normal user, it looks for a file called @code{$XDG_CONFIG_HOME/shepherd/init.scm}. If the @code{XDG_CONFIG_HOME} environment variable is not defined, @code{$HOME/.config/shepherd/init.scm} is used instead. With the option @@ -150,8 +150,8 @@ look instead. So if you want to start @command{shepherd} with an alternative file, use one of the following commands: @example -shepherd --config=/etc/dmdconf.scm.old -shepherd -c /etc/dmdconf.scm.old +shepherd --config=/etc/shepherd.conf.scm.old +shepherd -c /etc/shepherd.conf.scm.old @end example @cindex Starting a service -- 2.6.3