From patchwork Wed Feb 13 19:22:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1077 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 DA93E16C17; Wed, 13 Feb 2019 19:30:14 +0000 (GMT) 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,T_DKIM_INVALID autolearn=unavailable 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 829AB16C15 for ; Wed, 13 Feb 2019 19:30:14 +0000 (GMT) Received: from localhost ([127.0.0.1]:33972 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EX-0002Fp-7u for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 14:30:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EL-00020A-DZ for guix-patches@gnu.org; Wed, 13 Feb 2019 14:30:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu08c-0005GX-8B for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48068) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu08b-00058n-1v for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gu08a-0001lu-SD for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34470] [PATCH 8/8] services: gdm: Allow for custom X session scripts. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Feb 2019 19:24:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34470 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34470@debbugs.gnu.org Received: via spool by 34470-submit@debbugs.gnu.org id=B34470.15500858016725 (code B ref 34470); Wed, 13 Feb 2019 19:24:04 +0000 Received: (at 34470) by debbugs.gnu.org; 13 Feb 2019 19:23:21 +0000 Received: from localhost ([127.0.0.1]:47344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07t-0001kP-7Q for submit@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:21 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:45839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07r-0001jn-A9 for 34470@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:19 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 40A46247E5; Wed, 13 Feb 2019 14:23:14 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 14:23:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=1W6e9WQpmaLAD3CB7vrd9z7l3Oik/KfPa+4krzq6IBo=; b=Dvebo0Wp H/lS9sEWkqNE1O/vKaQ0Q48MBCt0JOJf+ztYn6YJymOWhZTkrsIO4mNS+VEVnWUy Fi5F7yDSlGcE+QHtML7ZkWTx8ox+0sBp3PNI5EWG17VI+X/faEEnS7ayL/NOG0QM IkxXNCUTvuenPQvVH8bLXaHPUlAw3RWIzi+OlyJOhBzVnCwbiDS3g/mcE6pe5HO3 VdF+leJsMuTnDoihkIkzlquevcOzT9uMdgUES4Mt5jS2QQGBRLHX3dI/G4CIozBc /Kc7tYW3E6MqJ2OZcccmY9ferbcf9P/DBFrPbNM82TPE/2Oect5/8gUZLTQ/zaTF tb+hXWL9FykqQg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtfedguddvgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu fedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomh epvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthesnhhghihrohdrtghomheq necukfhppeejgedrudduiedrudekiedrgeegnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hsrghmphhlvghtsehnghihrhhordgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from mrblack.lan (74-116-186-44.qc.dsl.ebox.net [74.116.186.44]) by mail.messagingengine.com (Postfix) with ESMTPA id B287DE4662; Wed, 13 Feb 2019 14:23:13 -0500 (EST) From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:21 -0500 Message-Id: <20190213192221.26599-8-samplet@ngyro.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <87o97fijyh.fsf@ngyro.com> References: <87o97fijyh.fsf@ngyro.com> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (gdm)[arguments]: Update pre-configure phase so that GDM runs an X session script specified by the variable GDM_X_SESSION; remove the '--enable-gdm-xsession' configuration option. * gnu/services/xorg.scm (): Add 'x-session' field. (gdm-shepherd-service): Set the GDM_X_SESSION variable. --- gnu/packages/gnome.scm | 9 ++++----- gnu/services/xorg.scm | 7 ++++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3c09d6b30a..a4563617d9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5328,10 +5328,6 @@ libxml2.") ;; service for TTY 1 before starting GDM). "--with-initial-vt=7" - ;; By default, GDM expects distributions to install a custom Xsession - ;; script. It provides a generic one if --enable-gdm-xsession is set. - "--enable-gdm-xsession" - ;; Use '/etc/environment' for locale settings instead of the ;; systemd-specific '/etc/locale.conf'. "--with-lang-file=/etc/environment" @@ -5381,6 +5377,7 @@ libxml2.") (let ((propagate '("GDM_CUSTOM_CONF" "GDM_DBUS_DAEMON" "GDM_X_SERVER" + "GDM_X_SESSION" ;; XXX: Remove this once GNOME Shell is ;; a dependency of GDM. "XDG_DATA_DIRS"))) @@ -5408,7 +5405,9 @@ libxml2.") (("\"dbus-daemon\"") "g_getenv (\"GDM_DBUS_DAEMON\")") (("X_SERVER") - "g_getenv (\"GDM_X_SERVER\")")) + "g_getenv (\"GDM_X_SERVER\")") + (("GDMCONFDIR \"/Xsession\"") + "g_getenv (\"GDM_X_SESSION\")")) ;; Use an absolute path for GNOME Session. (substitute* "daemon/gdm-launch-environment.c" (("\"gnome-session\"") diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 4e6f5ad44f..f7d07b309e 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -646,7 +646,9 @@ makes the good ol' XlockMore usable." (gnome-shell-assets gdm-configuration-gnome-shell-assets (default (list adwaita-icon-theme font-cantarell))) (x-server gdm-configuration-x-server - (default (xorg-wrapper)))) + (default (xorg-wrapper))) + (x-session gdm-configuration-x-session + (default (xinitrc)))) (define (gdm-configuration-file config) (mixed-text-file "gdm-custom.conf" @@ -717,6 +719,9 @@ makes the good ol' XlockMore usable." (string-append "GDM_X_SERVER=" #$(gdm-configuration-x-server config)) + (string-append + "GDM_X_SESSION=" + #$(gdm-configuration-x-session config)) (string-append "XDG_DATA_DIRS=" ((lambda (ls) (string-join ls ":"))