From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 08/11] services: xorg: Use 'shepherd' instead of 'dmd'. Date: Thu, 28 Jan 2016 00:10:33 +0300 Message-ID: <1453929036-10408-9-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]:45936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOXMl-0008Fn-0r for guix-devel@gnu.org; Wed, 27 Jan 2016 16:11:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOXMj-0006bw-58 for guix-devel@gnu.org; Wed, 27 Jan 2016 16:11:02 -0500 Received: from mail-lb0-x243.google.com ([2a00:1450:4010:c04::243]:34697) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOXMi-0006b1-TQ for guix-devel@gnu.org; Wed, 27 Jan 2016 16:11:01 -0500 Received: by mail-lb0-x243.google.com with SMTP id oe3so898157lbb.1 for ; Wed, 27 Jan 2016 13:11:00 -0800 (PST) Received: from localhost.localdomain ([217.107.192.146]) by smtp.gmail.com with ESMTPSA id p66sm1045517lfe.42.2016.01.27.13.10.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jan 2016 13:10:59 -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/xorg.scm (slim-configuration-dmd): Rename to... (slim-configuration-shepherd): ... this. (slim-shepherd-service): Adjust accordingly. (slim-service): Take 'shepherd' keyword argument. --- gnu/services/xorg.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 4b81bd9..fbe6fad 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -236,8 +236,8 @@ which should be passed to this script as the first argument. If not, the (theme-name slim-configuration-theme-name) (xauth slim-configuration-xauth (default xauth)) - (dmd slim-configuration-dmd - (default dmd)) + (shepherd slim-configuration-shepherd + (default shepherd)) (bash slim-configuration-bash (default bash)) (auto-login-session slim-configuration-auto-login-session) @@ -257,7 +257,7 @@ which should be passed to this script as the first argument. If not, the (slim (slim-configuration-slim config)) (xauth (slim-configuration-xauth config)) (startx (slim-configuration-startx config)) - (dmd (slim-configuration-dmd config)) + (shepherd (slim-configuration-shepherd config)) (theme-name (slim-configuration-theme-name config))) (mixed-text-file "slim.cfg" " default_path /run/current-system/profile/bin @@ -272,8 +272,8 @@ login_cmd exec " xinitrc " %session sessiondir /run/current-system/profile/share/xsessions session_msg session (F1 to change): -halt_cmd " dmd "/sbin/halt -reboot_cmd " dmd "/sbin/reboot\n" +halt_cmd " shepherd "/sbin/halt +reboot_cmd " shepherd "/sbin/reboot\n" (if (slim-configuration-auto-login? config) (string-append "auto_login yes\ndefault_user " (slim-configuration-default-user config) "\n") @@ -323,7 +323,7 @@ reboot_cmd " dmd "/sbin/reboot\n" (default-user "") (theme %default-slim-theme) (theme-name %default-slim-theme-name) - (xauth xauth) (dmd dmd) (bash bash) + (xauth xauth) (shepherd shepherd) (bash bash) (auto-login-session #~(string-append #$windowmaker "/bin/wmaker")) (startx (xorg-start-command))) @@ -358,7 +358,7 @@ theme." (allow-empty-passwords? allow-empty-passwords?) (auto-login? auto-login?) (default-user default-user) (theme theme) (theme-name theme-name) - (xauth xauth) (dmd dmd) (bash bash) + (xauth xauth) (shepherd shepherd) (bash bash) (auto-login-session auto-login-session) (startx startx)))) -- 2.6.3