From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 07/11] services: shepherd: Rename shepherd configuration file. Date: Thu, 28 Jan 2016 00:10:32 +0300 Message-ID: <1453929036-10408-8-git-send-email-alezost@gmail.com> References: <1453929036-10408-1-git-send-email-alezost@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOXMj-0008CW-OQ for guix-devel@gnu.org; Wed, 27 Jan 2016 16:11:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOXMi-0006aj-Ee for guix-devel@gnu.org; Wed, 27 Jan 2016 16:11:01 -0500 Received: from mail-lb0-x243.google.com ([2a00:1450:4010:c04::243]:36497) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOXMh-0006Zu-Vu for guix-devel@gnu.org; Wed, 27 Jan 2016 16:11:00 -0500 Received: by mail-lb0-x243.google.com with SMTP id ad5so896816lbc.3 for ; Wed, 27 Jan 2016 13:10:59 -0800 (PST) Received: from localhost.localdomain ([217.107.192.146]) by smtp.gmail.com with ESMTPSA id p66sm1045517lfe.42.2016.01.27.13.10.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jan 2016 13:10:58 -0800 (PST) In-Reply-To: <1453929036-10408-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 * gnu/services/shepherd.scm (dmd-configuration-file): Rename to... (shepherd-configuration-file): ... this. Use "shepherd.conf" name. (dmd-boot-gexp): Use it. --- gnu/services/shepherd.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index a33985e..ccb71f3 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -55,13 +55,13 @@ ;;; Commentary: ;;; -;;; Instantiating system services as a dmd configuration file. +;;; Instantiating system services as a shepherd configuration file. ;;; ;;; Code: (define (dmd-boot-gexp services) - (mlet %store-monad ((dmd-conf (dmd-configuration-file services))) + (mlet %store-monad ((shepherd-conf (shepherd-configuration-file services))) (return #~(begin ;; Keep track of the booted system. (false-if-exception (delete-file "/run/booted-system")) @@ -79,7 +79,7 @@ ;; Start shepherd. (execl (string-append #$shepherd "/bin/shepherd") - "shepherd" "--config" #$dmd-conf))))) + "shepherd" "--config" #$shepherd-conf))))) (define dmd-root-service-type (service-type @@ -207,8 +207,8 @@ stored." #:start #$(dmd-service-start service) #:stop #$(dmd-service-stop service))))) -(define (dmd-configuration-file services) - "Return the dmd configuration file for SERVICES." +(define (shepherd-configuration-file services) + "Return the shepherd configuration file for SERVICES." (define modules (delete-duplicates (append-map dmd-service-imported-modules services))) @@ -242,7 +242,7 @@ stored." (filter dmd-service-auto-start? services))))) - (gexp->file "dmd.conf" config))) + (gexp->file "shepherd.conf" config))) (define (dmd-service-back-edges services) "Return a procedure that, when given a from SERVICES, returns -- 2.6.3