From patchwork Wed May 8 10:29:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 13929 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6BCF616FD2; Wed, 8 May 2019 11:30:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CBFFE16FCE for ; Wed, 8 May 2019 11:30:10 +0100 (BST) Received: from localhost ([127.0.0.1]:34469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOJpy-0004k8-2e for patchwork@mira.cbaines.net; Wed, 08 May 2019 06:30:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOJpv-0004jk-RP for guix-patches@gnu.org; Wed, 08 May 2019 06:30:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOJpt-0004Hb-T3 for guix-patches@gnu.org; Wed, 08 May 2019 06:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46846) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOJpq-0004Fi-AH for guix-patches@gnu.org; Wed, 08 May 2019 06:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hOJpp-0001p6-V5 for guix-patches@gnu.org; Wed, 08 May 2019 06:30:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35493] [PATCH 1/3] gnu: slim: Allow customisation of Xorg display. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 May 2019 10:30:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Diego Nicola Barbato Received: via spool by 35493-submit@debbugs.gnu.org id=B35493.15573113946973 (code B ref 35493); Wed, 08 May 2019 10:30:01 +0000 Received: (at 35493) by debbugs.gnu.org; 8 May 2019 10:29:54 +0000 Received: from localhost ([127.0.0.1]:60390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hOJpi-0001oP-Ce for submit@debbugs.gnu.org; Wed, 08 May 2019 06:29:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43834) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hOJpf-0001o9-LT for 35493@debbugs.gnu.org; Wed, 08 May 2019 06:29:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:48339) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOJpZ-0004Ao-Jp; Wed, 08 May 2019 06:29:45 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36232 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hOJpY-0000Tu-Ut; Wed, 08 May 2019 06:29:45 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <871s1kad42.fsf@GlaDOS.home> <87zho88yh4.fsf@GlaDOS.home> <87muk0m13s.fsf@gnu.org> <874l67rf8o.fsf@GlaDOS.home> <87woj25pxy.fsf@gnu.org> <87tve6orqb.fsf@GlaDOS.home> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 19 =?utf-8?q?Flor=C3=A9al?= an 227 de la =?utf-8?q?R?= =?utf-8?q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 08 May 2019 12:29:42 +0200 In-Reply-To: <87tve6orqb.fsf@GlaDOS.home> (Diego Nicola Barbato's message of "Tue, 07 May 2019 23:54:36 +0200") Message-ID: <87v9ylz1bd.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 35493@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, Diego Nicola Barbato skribis: > Ludovic Courtès writes: [...] >> Perhaps a simple fix is, when there’s only one server launched, to have >> the Shepherd service provide both ‘xorg-server-vtN’ and ‘xorg-server’. >> Or to special-case vt7 such that the service for vt7 provides both >> ‘xorg-server’ and ‘xorg-server-vt7’. >> >> Thoughts? > > How about changing the default value of vt to #f and having the Shepherd > service provide ‘xorg-server-vtN’ only if vt is set to "vtN" and > ‘xorg-server’ otherwise. That way the name of the default Shepherd > service would not change. I think I would prefer special-casing vt7, as shown below. That way the ‘vt’ field would always be a string, which looks more consistent to me. Thoughts? Thanks, Ludo’. diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 65e9d48915..f7c8684738 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -549,8 +549,11 @@ reboot_cmd " shepherd "/sbin/reboot\n" (list (shepherd-service (documentation "Xorg display server") - (provision (list (symbol-append 'xorg-server- - (string->symbol vt)))) + (provision (cons (symbol-append 'xorg-server- + (string->symbol vt)) + (if (string=? vt "vt7") + '(xorg-server) + '()))) (requirement '(user-processes host-name udev)) (start #~(lambda ()