From patchwork Sat Feb 18 15:19:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47101 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 3820B1685F; Sat, 18 Feb 2023 15:20:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D2D3F16738 for ; Sat, 18 Feb 2023 15:20:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTP0N-0007kn-Dr; Sat, 18 Feb 2023 10:20:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pTP0M-0007kX-Ib for guix-patches@gnu.org; Sat, 18 Feb 2023 10:20:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pTP0M-0006UI-67 for guix-patches@gnu.org; Sat, 18 Feb 2023 10:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pTP0M-0001Lw-11 for guix-patches@gnu.org; Sat, 18 Feb 2023 10:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60756] [PATCH v2 1/2] services: Add x11-socket-directory-service-type. References: In-Reply-To: Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Feb 2023 15:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60756 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60756@debbugs.gnu.org Cc: me@tobias.gr, Bruno Victal Received: via spool by 60756-submit@debbugs.gnu.org id=B60756.16767335855160 (code B ref 60756); Sat, 18 Feb 2023 15:20:01 +0000 Received: (at 60756) by debbugs.gnu.org; 18 Feb 2023 15:19:45 +0000 Received: from localhost ([127.0.0.1]:44744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTP04-0001LA-Hv for submit@debbugs.gnu.org; Sat, 18 Feb 2023 10:19:44 -0500 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:35302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTP02-0001L0-Es for 60756@debbugs.gnu.org; Sat, 18 Feb 2023 10:19:43 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id D1C1020CBC; Sat, 18 Feb 2023 16:19:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 8728A80097; Sat, 18 Feb 2023 16:19:36 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id JakOPvoGPe19; Sat, 18 Feb 2023 16:19:36 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B166680079; Sat, 18 Feb 2023 16:19:35 +0100 (CET) From: Bruno Victal Date: Sat, 18 Feb 2023 15:19:31 +0000 Message-Id: <156c8abd42d67c8174f274ca933bdc495efc1962.1676733543.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The x11-socket-directory-service misuses activation-service-type to create directories. This kind of usage is incorrect since activation-service-type does not depend of file-systems and incompatible with user defined /tmp mount. This commit turns x11-socket-directory-service into a shepherd one-shot service by defining a new x11-socket-directory-service-type. * gnu/services/desktop.scm (x11-socket-directory-service-type): New variable. (x11-socket-directory-service): Deprecate variable. (desktop-services-for-system): Use new service-type. * gnu/tests/lightdm.scm: Use new service-type. --- gnu/services/desktop.scm | 44 ++++++++++++++++++++++++++++++---------- gnu/tests/lightdm.scm | 2 +- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index fe1f0fd20a..b2983667b8 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Reza Alizadeh Majd ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021, 2022 muradm +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -148,7 +149,8 @@ (define-module (gnu services desktop) xfce-desktop-service xfce-desktop-service-type - x11-socket-directory-service + x11-socket-directory-service ;deprecated + x11-socket-directory-service-type enlightenment-desktop-configuration enlightenment-desktop-configuration? @@ -1496,18 +1498,38 @@ (define lxqt-desktop-service-type ;;; X11 socket directory service ;;; -(define x11-socket-directory-service +(define x11-socket-directory-service-type + (let ((x11-socket-directory-shepherd-service + (shepherd-service + (documentation "Create /tmp/.X11-unix for XWayland.") + (requirement '(file-systems)) + (provision '(x11-socket-directory)) + (one-shot? #t) + (start #~(lambda _ + (let ((directory "/tmp/.X11-unix")) + (mkdir-p directory) + (chmod directory #o1777))))))) + (service-type + (name 'x11-socket-directory-service) + (extensions + (list + (service-extension shepherd-root-service-type + (compose + list + (const x11-socket-directory-shepherd-service))))) + (default-value #f) ; no default value required + (description + "Create @file{/tmp/.X11-unix} for XWayland. When using X11, libxcb +takes care of creating that directory however, when using XWayland, we +need to create it beforehand.")))) + +(define-deprecated x11-socket-directory-service + x11-socket-directory-service-type ;; Return a service that creates /tmp/.X11-unix. When using X11, libxcb ;; takes care of creating that directory. However, when using XWayland, we ;; need to create beforehand. Thus, create it unconditionally here. - (simple-service 'x11-socket-directory - activation-service-type - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - (let ((directory "/tmp/.X11-unix")) - (mkdir-p directory) - (chmod directory #o1777)))))) + (service x11-socket-directory-service-type)) + ;;; ;;; Enlightenment desktop service. @@ -1808,7 +1830,7 @@ (define* (desktop-services-for-system #:optional (service ntp-service-type) - x11-socket-directory-service + (service x11-socket-directory-service-type) (service pulseaudio-service-type) (service alsa-service-type) diff --git a/gnu/tests/lightdm.scm b/gnu/tests/lightdm.scm index 57d029a75a..d260d844d6 100644 --- a/gnu/tests/lightdm.scm +++ b/gnu/tests/lightdm.scm @@ -50,7 +50,7 @@ (define minimal-desktop-services (service polkit-service-type) (elogind-service) (dbus-service) - x11-socket-directory-service)) + (service x11-socket-directory-service-type))) (define %lightdm-os (operating-system From patchwork Sat Feb 18 15:19:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47102 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 AC2021685B; Sat, 18 Feb 2023 15:20:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7C1E716303 for ; Sat, 18 Feb 2023 15:20:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTP0N-0007kr-UR; Sat, 18 Feb 2023 10:20:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pTP0M-0007ke-Tn for guix-patches@gnu.org; Sat, 18 Feb 2023 10:20:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pTP0M-0006Ux-KL for guix-patches@gnu.org; Sat, 18 Feb 2023 10:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pTP0M-0001M3-Dn for guix-patches@gnu.org; Sat, 18 Feb 2023 10:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60756] [PATCH v2 2/2] tests: gdm: Remove tmpfs related tests. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Feb 2023 15:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60756 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60756@debbugs.gnu.org Cc: me@tobias.gr, Bruno Victal Received: via spool by 60756-submit@debbugs.gnu.org id=B60756.16767335925181 (code B ref 60756); Sat, 18 Feb 2023 15:20:02 +0000 Received: (at 60756) by debbugs.gnu.org; 18 Feb 2023 15:19:52 +0000 Received: from localhost ([127.0.0.1]:44747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTP0C-0001LU-0Z for submit@debbugs.gnu.org; Sat, 18 Feb 2023 10:19:52 -0500 Received: from smtpmciv6.myservices.hosting ([185.26.106.201]:51690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTP09-0001LM-Qa for 60756@debbugs.gnu.org; Sat, 18 Feb 2023 10:19:50 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv6.myservices.hosting (Postfix) with ESMTP id BA85820CD8; Sat, 18 Feb 2023 16:19:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 65DA080097; Sat, 18 Feb 2023 16:19:48 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id hnZx4hOvw1v1; Sat, 18 Feb 2023 16:19:48 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id AD83180079; Sat, 18 Feb 2023 16:19:47 +0100 (CET) From: Bruno Victal Date: Sat, 18 Feb 2023 15:19:32 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: <156c8abd42d67c8174f274ca933bdc495efc1962.1676733543.git.mirai@makinata.eu> References: <156c8abd42d67c8174f274ca933bdc495efc1962.1676733543.git.mirai@makinata.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches No longer required with the introduction of x11-socket-directory-service-type. This test never managed to reveal the problem described in #57589 because from gnu/system/vm.scm it is seen that our "/tmp" mount is filtered out and replaced with a "/tmp" file-system that is mounted with (needed-for-boot? #t). This last bit is crucial as the problem was caused by the user specified "/tmp" file-system lacking this part which caused "/tmp" being mounted after x11-socket-directory-service has run, effectively shadowing the directory. * gnu/tests/gdm.scm (%test-gdm-wayland-tmpfs): Delete variable. (make-os): Remove tmpfs? argument. (run-gdm-test): Remove tmpfs? argument. Add a small delay since waiting for gdm.pid is not enough causing the tests to fail sporadically. --- gnu/tests/gdm.scm | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/gnu/tests/gdm.scm b/gnu/tests/gdm.scm index 70a86b9065..70affb3ee6 100644 --- a/gnu/tests/gdm.scm +++ b/gnu/tests/gdm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Bruno Victal . +;;; Copyright © 2022⁠–⁠2023 Bruno Victal . ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,36 +23,26 @@ (define-module (gnu tests gdm) #:use-module (gnu services desktop) #:use-module (gnu services xorg) #:use-module (gnu system) - #:use-module (gnu system file-systems) #:use-module (gnu system vm) #:use-module (guix gexp) #:use-module (ice-9 format) #:export (%test-gdm-x11 - %test-gdm-wayland - %test-gdm-wayland-tmpfs)) + %test-gdm-wayland)) -(define* (make-os #:key wayland? tmp-tmpfs?) +(define* (make-os #:key wayland?) (operating-system (inherit %simple-os) (services (modify-services %desktop-services (gdm-service-type config => (gdm-configuration (inherit config) - (wayland? wayland?))))) - (file-systems (if tmp-tmpfs? (cons (file-system - (mount-point "/tmp") - (device "none") - (type "tmpfs") - (flags '(no-dev no-suid)) - (check? #f)) - %base-file-systems) - %base-file-systems)))) - -(define* (run-gdm-test #:key wayland? tmp-tmpfs?) + (wayland? wayland?))))))) + +(define* (run-gdm-test #:key wayland?) "Run tests in a vm which has gdm running." (define os (marionette-operating-system - (make-os #:wayland? wayland? #:tmp-tmpfs? tmp-tmpfs?) + (make-os #:wayland? wayland?) #:imported-modules '((gnu services herd)))) (define vm @@ -60,7 +50,7 @@ (define* (run-gdm-test #:key wayland? tmp-tmpfs?) (operating-system os) (memory-size 1024))) - (define name (format #f "gdm-~:[x11~;wayland~]~:[~;-tmpfs~]" wayland? tmp-tmpfs?)) + (define name (format #f "gdm-~:[x11~;wayland~]" wayland?)) (define test (with-imported-modules '((gnu build marionette)) @@ -86,6 +76,9 @@ (define* (run-gdm-test #:key wayland? tmp-tmpfs?) (test-assert "gdm ready" (wait-for-file "/var/run/gdm/gdm.pid" marionette)) + ;; waiting for gdm.pid is not enough, tests may still sporadically fail. + (sleep 1) + (test-equal (string-append "session-type is " expected-session-type) expected-session-type (marionette-eval @@ -118,10 +111,3 @@ (define %test-gdm-wayland (name "gdm-wayland") (description "Basic tests for the GDM service. (Wayland)") (value (run-gdm-test #:wayland? #t)))) - -(define %test-gdm-wayland-tmpfs - (system-test - ;; See . - (name "gdm-wayland-tmpfs") - (description "Basic tests for the GDM service. (Wayland, /tmp as tmpfs)") - (value (run-gdm-test #:wayland? #t #:tmp-tmpfs? #t))))