From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 12 10:43:35 2023 Received: (at submit) by debbugs.gnu.org; 12 Jan 2023 15:43:35 +0000 Received: from localhost ([127.0.0.1]:48372 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFzjr-0007zZ-AN for submit@debbugs.gnu.org; Thu, 12 Jan 2023 10:43:35 -0500 Received: from lists.gnu.org ([209.51.188.17]:59422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFzjp-0007zR-S4 for submit@debbugs.gnu.org; Thu, 12 Jan 2023 10:43:34 -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 1pFzjo-0003Ao-RV for guix-patches@gnu.org; Thu, 12 Jan 2023 10:43:32 -0500 Received: from smtpm7.myservices.hosting ([185.26.105.208]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFzjm-0007E7-WF for guix-patches@gnu.org; Thu, 12 Jan 2023 10:43:32 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpm7.myservices.hosting (Postfix) with ESMTP id 1612420CC0 for ; Thu, 12 Jan 2023 16:43:18 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id B83838009B; Thu, 12 Jan 2023 16:43:18 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id VonsL9HiwWky; Thu, 12 Jan 2023 16:43:18 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 1CD5B80099; Thu, 12 Jan 2023 16:43:18 +0100 (CET) From: Bruno Victal To: guix-patches@gnu.org Subject: [PATCH 0/2] Add x11-socket-directory-service-type. Date: Thu, 12 Jan 2023 15:43:15 +0000 Message-Id: X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Debbugs-CC: ludo@gnu.org X-Debbugs-CC: shegeley@gmail.com X-Debbugs-CC: felix.lechner@lease-up.com tags: patch Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.26.105.208; envelope-from=mirai@makinata.eu; helo=smtpm7.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Bruno Victal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This replaces x11-socket-directory-service with a shepherd one-shot service that takes file-system as a dependent target. Fixes #57589. Bruno Victal (2): services: Add x11-socket-directory-service-type. Revert "tests: Add gdm tests." gnu/local.mk | 1 - gnu/services/desktop.scm | 44 ++++++++++---- gnu/tests/gdm.scm | 127 --------------------------------------- gnu/tests/lightdm.scm | 2 +- 4 files changed, 34 insertions(+), 140 deletions(-) delete mode 100644 gnu/tests/gdm.scm base-commit: ef0613a81dca73602e702cb5f5444ee94566f983 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 12 10:46:40 2023 Received: (at 60756) by debbugs.gnu.org; 12 Jan 2023 15:46:41 +0000 Received: from localhost ([127.0.0.1]:48384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFzmq-00085P-EX for submit@debbugs.gnu.org; Thu, 12 Jan 2023 10:46:40 -0500 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:37114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFzmn-00085G-D1 for 60756@debbugs.gnu.org; Thu, 12 Jan 2023 10:46:38 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 9C55720803 for <60756@debbugs.gnu.org>; Thu, 12 Jan 2023 16:46:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 4826B8009B; Thu, 12 Jan 2023 16:46: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-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id V6-3eHFSApa2; Thu, 12 Jan 2023 16:46:35 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 883CF8009D; Thu, 12 Jan 2023 16:46:35 +0100 (CET) From: Bruno Victal To: 60756@debbugs.gnu.org Subject: [PATCH 1/2] services: Add x11-socket-directory-service-type. Date: Thu, 12 Jan 2023 15:46:28 +0000 Message-Id: <6d06ecb7463a09830b87395200849037decd4596.1673537696.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60756 Cc: Bruno Victal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 12 10:47:04 2023 Received: (at 60756) by debbugs.gnu.org; 12 Jan 2023 15:47:04 +0000 Received: from localhost ([127.0.0.1]:48388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFznE-00086R-0V for submit@debbugs.gnu.org; Thu, 12 Jan 2023 10:47:04 -0500 Received: from smtpm6.myservices.hosting ([185.26.105.207]:57974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFznB-00085r-1O for 60756@debbugs.gnu.org; Thu, 12 Jan 2023 10:47:03 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpm6.myservices.hosting (Postfix) with ESMTP id 51D6320D2D for <60756@debbugs.gnu.org>; Thu, 12 Jan 2023 16:47:00 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 007668009C; Thu, 12 Jan 2023 16:47:00 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Asjque7TORSn; Thu, 12 Jan 2023 16:46:59 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 574858009B; Thu, 12 Jan 2023 16:46:59 +0100 (CET) From: Bruno Victal To: 60756@debbugs.gnu.org Subject: [PATCH 2/2] Revert "tests: Add gdm tests." Date: Thu, 12 Jan 2023 15:46:29 +0000 Message-Id: <779306f1aa618bc36ddd6d36716aaf67f820cff4.1673537696.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60756 Cc: Bruno Victal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This reverts commit b2a848d23d37f31496e1ff664f1dcf6abcdcc388. No longer required with the introduction of x11-socket-directory-service-type. These tests never managed to reveal the problem described in #57589 because from gnu/system/vm.scm it is seen that "/tmp" is mounted with (needed-for-boot? #t) and that the virtualized-operating-system procedure strips our custom defined "/tmp" filesystem entries. --- gnu/local.mk | 1 - gnu/tests/gdm.scm | 127 ---------------------------------------------- 2 files changed, 128 deletions(-) delete mode 100644 gnu/tests/gdm.scm diff --git a/gnu/local.mk b/gnu/local.mk index 184f43e753..e0841c8dbb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -765,7 +765,6 @@ GNU_SYSTEM_MODULES = \ %D%/tests/docker.scm \ %D%/tests/file-sharing.scm \ %D%/tests/ganeti.scm \ - %D%/tests/gdm.scm \ %D%/tests/guix.scm \ %D%/tests/monitoring.scm \ %D%/tests/nfs.scm \ diff --git a/gnu/tests/gdm.scm b/gnu/tests/gdm.scm deleted file mode 100644 index 70a86b9065..0000000000 --- a/gnu/tests/gdm.scm +++ /dev/null @@ -1,127 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Bruno Victal . -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu tests gdm) - #:use-module (gnu tests) - #:use-module (gnu packages freedesktop) - #:use-module (gnu services) - #: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)) - -(define* (make-os #:key wayland? tmp-tmpfs?) - (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?) - "Run tests in a vm which has gdm running." - (define os - (marionette-operating-system - (make-os #:wayland? wayland? #:tmp-tmpfs? tmp-tmpfs?) - #:imported-modules '((gnu services herd)))) - - (define vm - (virtual-machine - (operating-system os) - (memory-size 1024))) - - (define name (format #f "gdm-~:[x11~;wayland~]~:[~;-tmpfs~]" wayland? tmp-tmpfs?)) - - (define test - (with-imported-modules '((gnu build marionette)) - #~(begin - (use-modules (gnu build marionette) - (ice-9 format) - (srfi srfi-64)) - - (let* ((marionette (make-marionette (list #$vm))) - (expected-session-type #$(if wayland? "wayland" "x11"))) - - (test-runner-current (system-test-runner #$output)) - (test-begin #$name) - - ;; service for gdm is called xorg-server - (test-assert "service is running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'xorg-server)) - marionette)) - - (test-assert "gdm ready" - (wait-for-file "/var/run/gdm/gdm.pid" marionette)) - - (test-equal (string-append "session-type is " expected-session-type) - expected-session-type - (marionette-eval - '(begin - (use-modules (ice-9 popen) - (ice-9 rdelim)) - - (let* ((loginctl #$(file-append elogind "/bin/loginctl")) - (get-session-cmd (string-join `(,loginctl "show-user" "gdm" - "--property Display" "--value"))) - (session (call-with-port (open-input-pipe get-session-cmd) read-line)) - (get-type-cmd (string-join `(,loginctl "show-session" ,session - "--property Type" "--value"))) - (type (call-with-port (open-input-pipe get-type-cmd) read-line))) - type)) - marionette)) - - (test-end))))) - - (gexp->derivation (string-append name "-test") test)) - -(define %test-gdm-x11 - (system-test - (name "gdm-x11") - (description "Basic tests for the GDM service. (X11)") - (value (run-gdm-test)))) - -(define %test-gdm-wayland - (system-test - (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)))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 12 10:49:16 2023 Received: (at 60756) by debbugs.gnu.org; 12 Jan 2023 15:49:17 +0000 Received: from localhost ([127.0.0.1]:48394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFzpM-0008D4-Mv for submit@debbugs.gnu.org; Thu, 12 Jan 2023 10:49:16 -0500 Received: from smtpm3.myservices.hosting ([185.26.105.234]:55344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFzpL-0008Cw-4i for 60756@debbugs.gnu.org; Thu, 12 Jan 2023 10:49:15 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpm3.myservices.hosting (Postfix) with ESMTP id 147B420E91; Thu, 12 Jan 2023 16:49:12 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id C31B78009E; Thu, 12 Jan 2023 16:49:12 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id UknvAj2zwz_c; Thu, 12 Jan 2023 16:49:12 +0100 (CET) Received: from [192.168.1.239] (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 673568009B; Thu, 12 Jan 2023 16:49:12 +0100 (CET) Message-ID: Date: Thu, 12 Jan 2023 15:49:11 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Content-Language: en-US To: 60756@debbugs.gnu.org From: Bruno Victal Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: cc Ludovic, Grigory Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject X-Debbugs-Envelope-To: 60756 Cc: =?UTF-8?Q?Ludovic_Court=c3=a8s?= , shegeley X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) cc Ludovic, Grigory From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 18 10:19:45 2023 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 To: 60756@debbugs.gnu.org Subject: [PATCH v2 1/2] services: Add x11-socket-directory-service-type. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60756 Cc: me@tobias.gr, Bruno Victal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 18 10:19:52 2023 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 To: 60756@debbugs.gnu.org Subject: [PATCH v2 2/2] tests: gdm: Remove tmpfs related tests. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60756 Cc: me@tobias.gr, Bruno Victal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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)))) -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 06 07:35:22 2023 Received: (at 60756) by debbugs.gnu.org; 6 Mar 2023 12:35:22 +0000 Received: from localhost ([127.0.0.1]:41569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZA3m-0004MW-1Q for submit@debbugs.gnu.org; Mon, 06 Mar 2023 07:35:22 -0500 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:51882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZA3k-0004MK-1j for 60756@debbugs.gnu.org; Mon, 06 Mar 2023 07:35:20 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id 11E0E2087E; Mon, 6 Mar 2023 13:35:16 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id B65EF8009A; Mon, 6 Mar 2023 13:35:16 +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 Rd1NY8piFykb; Mon, 6 Mar 2023 13:35:16 +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 EA4D780079; Mon, 6 Mar 2023 13:35:15 +0100 (CET) From: Bruno Victal To: 60756@debbugs.gnu.org Subject: [PATCH v3 1/2] services: Add x11-socket-directory-service-type. Date: Mon, 6 Mar 2023 12:35:01 +0000 Message-Id: <4eab1cc425f89bf321477b432ba407a71285e974.1678105938.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60756 Cc: dev@jpoiret.xyz, Bruno Victal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 on file-systems, hence 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 procedure. (desktop-services-for-system): Use new service-type. * gnu/tests/lightdm.scm: Ditto. --- Changes since v2: * Tweaked commit message. * Resolved merge conflict. 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 aa9f93997d..59f325b24b 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. ;;; @@ -154,7 +155,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? @@ -1573,18 +1575,38 @@ (define sugar-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. @@ -1885,7 +1907,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 dda472bd74..6011d2c515 100644 --- a/gnu/tests/lightdm.scm +++ b/gnu/tests/lightdm.scm @@ -50,7 +50,7 @@ (define minimal-desktop-services (service polkit-service-type) (service elogind-service-type) (service dbus-root-service-type) - x11-socket-directory-service)) + (service x11-socket-directory-service-type))) (define %lightdm-os (operating-system -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 06 07:35:25 2023 Received: (at 60756) by debbugs.gnu.org; 6 Mar 2023 12:35:25 +0000 Received: from localhost ([127.0.0.1]:41572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZA3o-0004Mm-JJ for submit@debbugs.gnu.org; Mon, 06 Mar 2023 07:35:24 -0500 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:36954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZA3m-0004MY-Pv for 60756@debbugs.gnu.org; Mon, 06 Mar 2023 07:35:23 -0500 Received: from smtpmciv7.myservices.hosting (smtpmciv7.myservices.hosting [185.26.106.202]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id 9DB78202C9; Mon, 6 Mar 2023 13:35:21 +0100 (CET) Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv7.myservices.hosting (Postfix) with ESMTP id 0D7EA20847; Mon, 6 Mar 2023 13:35:19 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id A256E80079; Mon, 6 Mar 2023 13:35:19 +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 FGsZjt_6kw6x; Mon, 6 Mar 2023 13:35:16 +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 68A2A80097; Mon, 6 Mar 2023 13:35:16 +0100 (CET) From: Bruno Victal To: 60756@debbugs.gnu.org Subject: [PATCH v3 2/2] tests: gdm: Remove tmpfs related tests. Date: Mon, 6 Mar 2023 12:35:02 +0000 Message-Id: <56f1f2fbd4a0b9b442a53ebb41137a1d982d4bbe.1678105938.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: <4eab1cc425f89bf321477b432ba407a71285e974.1678105938.git.mirai@makinata.eu> References: <4eab1cc425f89bf321477b432ba407a71285e974.1678105938.git.mirai@makinata.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60756 Cc: dev@jpoiret.xyz, Bruno Victal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This test never managed to reveal the problem described in [1] 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. [1]: * 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. --- Changes since v2: * Tweaked commit message. * substitute let* with let gnu/tests/gdm.scm | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/gnu/tests/gdm.scm b/gnu/tests/gdm.scm index 70a86b9065..ec1df4b797 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)) @@ -69,8 +59,8 @@ (define* (run-gdm-test #:key wayland? tmp-tmpfs?) (ice-9 format) (srfi srfi-64)) - (let* ((marionette (make-marionette (list #$vm))) - (expected-session-type #$(if wayland? "wayland" "x11"))) + (let ((marionette (make-marionette (list #$vm))) + (expected-session-type #$(if wayland? "wayland" "x11"))) (test-runner-current (system-test-runner #$output)) (test-begin #$name) @@ -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)))) -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 06 08:16:29 2023 Received: (at 60756) by debbugs.gnu.org; 6 Mar 2023 13:16:29 +0000 Received: from localhost ([127.0.0.1]:41675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZAhY-0005dB-QG for submit@debbugs.gnu.org; Mon, 06 Mar 2023 08:16:29 -0500 Received: from jpoiret.xyz ([206.189.101.64]:38202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZAhU-0005cx-7W for 60756@debbugs.gnu.org; Mon, 06 Mar 2023 08:16:26 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 865B81851DF for <60756@debbugs.gnu.org>; Mon, 6 Mar 2023 13:16:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1678108582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=lO6d56xLEhsUYKTsT4afHvxSTqp/68KU4gjGedmq+oE=; b=j+gcfktKHd1I+ge16qZZ5k7mV8xA3SMyvHbTV02PWHQ8OlDv//EMM5PIkEhHhKuS+Eg/rR HbOQnvqYhpdVvCzQlFQrhpAtNZMvtGUaxcPgqHO7CGgI+3O1Flltji21cxK0Yd1fnsYoRF viFo7RChaTum563ZMbCAvJopvECTRGskL38wFgEL17Zl1am3NJMtt5jiM45KpArqzXhbQu dmYnf0oYt6XckLyHw+olrtZSVVMnp4SaoCLxmm00GsBvqB1VMF3xb1ujv3fOWFY/rIoC1F WM4C3uAHKchjfsGCbnsD2XlakiqTtRsYAG8W1gQ3PX/M/9lpq8Ms8e8SEQcYEw== From: Josselin Poiret To: 60756@debbugs.gnu.org Subject: Re: [bug#60756] [PATCH v2 1/2] services: Add x11-socket-directory-service-type. In-Reply-To: <156c8abd42d67c8174f274ca933bdc495efc1962.1676733543.git.mirai@makinata.eu> References: <156c8abd42d67c8174f274ca933bdc495efc1962.1676733543.git.mirai@makinata.eu> Date: Mon, 06 Mar 2023 14:16:21 +0100 Message-ID: <877cvuqau2.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: text/plain Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60756 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) This message wasn't cced to the ML, so here it is again (sorry) FTR. This was in response to v2. Hi Bruno, Bruno Victal writes: > 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 Small typo: s/depend of/depend on/, that can be fixed by the committer. > 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. Looks good to me, tested it myself (note to self: don't forget `-enable-kvm`). Removing the tmpfs-specifc test is a good call here as well. Noting here that for the same reason as the test being useless, you can't test this patchset properly with `guix system vm`, since the file-systems get overridden. I tested it with `guix system image` instead, which only overrides the root and esp file systems if present. Best, -- Josselin Poiret From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 21 16:50:24 2023 Received: (at 60756-done) by debbugs.gnu.org; 21 Mar 2023 20:50:24 +0000 Received: from localhost ([127.0.0.1]:60938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peiw4-0001sl-CH for submit@debbugs.gnu.org; Tue, 21 Mar 2023 16:50:24 -0400 Received: from mail-qt1-f171.google.com ([209.85.160.171]:46915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peiw3-0001sX-3e for 60756-done@debbugs.gnu.org; Tue, 21 Mar 2023 16:50:23 -0400 Received: by mail-qt1-f171.google.com with SMTP id c19so19567090qtn.13 for <60756-done@debbugs.gnu.org>; Tue, 21 Mar 2023 13:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679431817; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=o0uLS01rW0kl7prWStUsiaEDiYsWP/kyF+Jb57fNrEA=; b=IYW8fCRR6n/5rzYGtFvBk4cwaP1IX8A6cN2yykGrvYpsDmUlxgiA3XYHEe2BJnCsQQ iuOn7MGpGelV0FMukn2vRGqQrloFTxelESDVQfQCPpDiysHR8N24Nd+LsuhwZfXh6R8u rLszSsRXam5V0oYe6LbBc0F4wFELg1NLc7Dez9XuEhDXZG7wZV0yfXjFWANeWni3uLuh kSQ8Tdt3AJFKP5x4k7RVF+y+aMHXvceOj6x6dB6ugPt/OKtBiDEfUUiDR0pNs7+FezE9 v9YazH7oO78D5O3/Df+JN3I4X5SmfyYNhb05xra0G+K4OEu+7reTwMmkEnartcaz0Y/S AV3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679431817; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=o0uLS01rW0kl7prWStUsiaEDiYsWP/kyF+Jb57fNrEA=; b=MlQPBoQPjDNdEH4TAvGxpv+tkU7lJrqBPRBB5Nt6lJQw5tbiL7haT4TgsnytXJbHx1 Ikkb6YGylVVjr87NsnvkBgbn0qFj+tw5iYgzOOEOQnbGxB5/B5Ya1B5KKTNr4ZAxF85T zT084k77ysJuHayzO2XxPhwClMji7zivjtyfl3ZF3tAp2XsiXALSAbiaIZi0RfSI1+xZ NejIvLvr0KkTcxhBn6EMcBzCvyWqdwFrFLGAfIVZ0A9JlVMxBwW3WXRiDsCW5A81F5IH dDno3KyzPpPZpOVU2B3wtVD7MMsL0uTWkAUtzilkDSUKMPim84+NIXu/x3vVWOB+Frqo 0ztg== X-Gm-Message-State: AO0yUKVCqeADDzkZoaiTE8slWfG7Bw329ctaU2uQNcrl5+S3t+5RrRhj +isuPxia9XpPDmCBgBGzYT88enRkp68Xhw== X-Google-Smtp-Source: AK7set8oKn80XSuUsW7s/39H6a9RE09dbd6sPSldhMBfNgdUiua+r8ZDzy7MDBy2CXb0FdmSuYp2Hw== X-Received: by 2002:a05:622a:1101:b0:3a9:818f:db3d with SMTP id e1-20020a05622a110100b003a9818fdb3dmr2186854qty.53.1679431817432; Tue, 21 Mar 2023 13:50:17 -0700 (PDT) Received: from hurd (dsl-10-130-195.b2b2c.ca. [72.10.130.195]) by smtp.gmail.com with ESMTPSA id g17-20020ac84811000000b003e1cf472b17sm3950060qtq.97.2023.03.21.13.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 13:50:17 -0700 (PDT) From: Maxim Cournoyer To: Bruno Victal Subject: Re: bug#60756: [PATCH 0/2] Add x11-socket-directory-service-type. References: <4eab1cc425f89bf321477b432ba407a71285e974.1678105938.git.mirai@makinata.eu> Date: Tue, 21 Mar 2023 16:50:15 -0400 In-Reply-To: <4eab1cc425f89bf321477b432ba407a71285e974.1678105938.git.mirai@makinata.eu> (Bruno Victal's message of "Mon, 6 Mar 2023 12:35:01 +0000") Message-ID: <87y1nplth4.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60756-done Cc: dev@jpoiret.xyz, 60756-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Bruno Victal writes: > 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 on file-systems, hence 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 procedure. > (desktop-services-for-system): Use new service-type. > * gnu/tests/lightdm.scm: Ditto. I've applied this series, with the small change: --8<---------------cut here---------------start------------->8--- modified gnu/services/desktop.scm @@ -1578,7 +1578,7 @@ (define sugar-desktop-service-type (define x11-socket-directory-service-type (let ((x11-socket-directory-shepherd-service (shepherd-service - (documentation "Create /tmp/.X11-unix for XWayland.") + (documentation "Create @file{/tmp/.X11-unix} for XWayland.") (requirement '(file-systems)) (provision '(x11-socket-directory)) (one-shot? #t) --8<---------------cut here---------------end--------------->8--- Thanks for the contribution and to Josselin for the review, which made me much more confident to install it (along with the QA badge). -- Thanks, Maxim From unknown Sun Jun 22 00:29:27 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 19 Apr 2023 11:24:13 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator