From 14d0106f53ee17aea8f176745bf6dd5d8a748965 Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Tue, 7 May 2019 22:22:48 +0200 Subject: [PATCH] services: slim: Make default Shepherd service provide 'xorg-server'. Commit 6426a8fb6c changed the name of the default Shepherd service from 'xorg-server' to 'xorg-server-vt7'. This patch changes it back. * gnu/services/xorg.scm (define-module): Use module (ice-9 format). ()[vt]: Change default value to #f. (slim-shepherd-service)[shepherd-service][provision]: Provide 'xorg-server-vtN' if vt is set to "vtN" and 'xorg-server' if vt is #f. --- gnu/services/xorg.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 65e9d48915..81e38665c9 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -52,6 +52,7 @@ #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) #:use-module (ice-9 match) + #:use-module (ice-9 format) #:export (xorg-configuration xorg-configuration? xorg-configuration-modules @@ -493,7 +494,7 @@ desktop session from the system or user profile will be used." (display slim-configuration-display (default ":0")) (vt slim-configuration-vt - (default "vt7")) + (default #f)) (sessreg slim-configuration-sessreg (default sessreg))) @@ -510,7 +511,8 @@ desktop session from the system or user profile will be used." (xauth (slim-configuration-xauth config)) (startx (xorg-start-command (slim-configuration-xorg config))) (display (slim-configuration-display config)) - (vt (slim-configuration-vt config)) + (vt? (slim-configuration-vt config)) + (vt (or vt? "vt7")) (shepherd (slim-configuration-shepherd config)) (theme-name (slim-configuration-theme-name config)) (sessreg (slim-configuration-sessreg config)) @@ -549,8 +551,8 @@ reboot_cmd " shepherd "/sbin/reboot\n" (list (shepherd-service (documentation "Xorg display server") - (provision (list (symbol-append 'xorg-server- - (string->symbol vt)))) + (provision (list (string->symbol + (format #f "xorg-server~@[-~a~]" vt?)))) (requirement '(user-processes host-name udev)) (start #~(lambda () -- 2.21.0