From patchwork Wed Feb 13 19:22:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1081 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 BD12516C17; Wed, 13 Feb 2019 19:30:41 +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 69A6F16C15 for ; Wed, 13 Feb 2019 19:30:41 +0000 (GMT) Received: from localhost ([127.0.0.1]:34019 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0Ey-0002fZ-SI for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 14:30:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EM-00020A-Ku for guix-patches@gnu.org; Wed, 13 Feb 2019 14:30:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu08a-00056S-Cg for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48066) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu08a-00053M-1q for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gu08Z-0001lf-Tj for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34470] [PATCH 6/8] gnu: gdm: Run dbus-daemon via a wrapper script. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Feb 2019 19:24:03 +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.15500857956695 (code B ref 34470); Wed, 13 Feb 2019 19:24:03 +0000 Received: (at 34470) by debbugs.gnu.org; 13 Feb 2019 19:23:15 +0000 Received: from localhost ([127.0.0.1]:47336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07n-0001jv-HK for submit@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:15 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:37817) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07l-0001jS-89 for 34470@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:14 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 2FCF324608; Wed, 13 Feb 2019 14:23:08 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 14:23:08 -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=FfBLhJ+x2z98o9h8F33JKk2+P8ACKEEPYO6vsZteZ7E=; b=gzbpk/UW D+VUHz8ovzcfEM72ylHRyjdLnttdGgzf8lkXB9tlf5hc8MyuVyn4YiA9QjKdrABI 2B6RdfVMs7iLhvkqrEJCLoVTd6Ax2y2tuk6xtyNiKcJEFKwqb4A4HKIg1+ATdyjA 4mQfAfQMy4iTfLdPuoCutOO0qltokrgb2oCrw75Io3AwcoWVsJFo7VN5R0TtAugL Bmk/G+MwsWcRE+4u+EuTRACarywkMxRXxZVVYfoHh6Lhgwc/GMQzvckZu4Z7SfEY TmspxU5hK+Tu3ztEkT7Zryh6KNLUJl05nj+q92ZS6cgl2nSGOQgvmdaL0F/0jHtD bjghUFPMPUwPSw== 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 C9BDEE423B; Wed, 13 Feb 2019 14:23:07 -0500 (EST) From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:19 -0500 Message-Id: <20190213192221.26599-6-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]: Modify the pre-configure phase so that GDM propagates the GDM_DBUS_DAEMON variable into the session environment and uses its value to invoke dbus-daemon. * gnu/services/xorg.scm (dbus-daemon-wrapper): New variable. (): Add 'dbus-daemon' field. (gdm-shepherd-service): Set GDM_DBUS_DAEMON before invoking gdm. --- gnu/packages/gnome.scm | 3 +++ gnu/services/xorg.scm | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index da1c976e07..3c09d6b30a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5379,6 +5379,7 @@ libxml2.") (("DATADIR \"/gnome") "\"/run/current-system/profile/share/gnome")) (let ((propagate '("GDM_CUSTOM_CONF" + "GDM_DBUS_DAEMON" "GDM_X_SERVER" ;; XXX: Remove this once GNOME Shell is ;; a dependency of GDM. @@ -5404,6 +5405,8 @@ libxml2.") (("\\(X_SERVER X_SERVER_ARG_FORMAT") "(\"%s\" X_SERVER_ARG_FORMAT, g_getenv (\"GDM_X_SERVER\")")) (substitute* '("daemon/gdm-x-session.c") + (("\"dbus-daemon\"") + "g_getenv (\"GDM_DBUS_DAEMON\")") (("X_SERVER") "g_getenv (\"GDM_X_SERVER\")")) ;; Use an absolute path for GNOME Session. diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index de5438e3fe..6a589779b9 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages xorg) #:use-module (gnu packages gl) + #:use-module (gnu packages glib) #:use-module (gnu packages display-managers) #:use-module (gnu packages gnustep) #:use-module (gnu packages gnome) @@ -623,12 +624,23 @@ makes the good ol' XlockMore usable." (home-directory "/var/lib/gdm") (shell (file-append shadow "/sbin/nologin"))))) +(define dbus-daemon-wrapper + (program-file "gdm-dbus-wrapper" + #~(begin + (setenv "XDG_CONFIG_DIRS" + "/run/current-system/profile/etc/xdg") + (setenv "XDG_DATA_DIRS" + "/run/current-system/profile/share") + (apply execl (string-append #$dbus "/bin/dbus-daemon") + (program-arguments))))) + (define-record-type* gdm-configuration make-gdm-configuration gdm-configuration? (gdm gdm-configuration-gdm (default gdm)) (allow-empty-passwords? gdm-configuration-allow-empty-passwords? (default #t)) (auto-login? gdm-configuration-auto-login? (default #f)) + (dbus-daemon gdm-configuration-dbus-daemon (default dbus-daemon-wrapper)) (default-user gdm-configuration-default-user (default #f)) (x-server gdm-configuration-x-server (default (xorg-wrapper)))) @@ -696,6 +708,9 @@ makes the good ol' XlockMore usable." (list (string-append "GDM_CUSTOM_CONF=" #$(gdm-configuration-file config)) + (string-append + "GDM_DBUS_DAEMON=" + #$(gdm-configuration-dbus-daemon config)) (string-append "GDM_X_SERVER=" #$(gdm-configuration-x-server config))