From patchwork Thu Jan 12 15:46:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46072 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 99C7B27BBEB; Thu, 12 Jan 2023 15:55:18 +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=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 0E0B727BBE9 for ; Thu, 12 Jan 2023 15:55:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFznV-0005LA-0z; Thu, 12 Jan 2023 10:47:21 -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 1pFznD-0005K5-Er for guix-patches@gnu.org; Thu, 12 Jan 2023 10:47:03 -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 1pFznC-0008A9-9n for guix-patches@gnu.org; Thu, 12 Jan 2023 10:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFznC-000863-6X for guix-patches@gnu.org; Thu, 12 Jan 2023 10:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60756] [PATCH 1/2] services: Add x11-socket-directory-service-type. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Jan 2023 15:47: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: Bruno Victal Received: via spool by 60756-submit@debbugs.gnu.org id=B60756.167353840131092 (code B ref 60756); Thu, 12 Jan 2023 15:47:02 +0000 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 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 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 Thu Jan 12 15:46:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46071 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 D19AA27BBEB; Thu, 12 Jan 2023 15:52:39 +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 293CB27BBE9 for ; Thu, 12 Jan 2023 15:52:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFzoL-0006NI-31; Thu, 12 Jan 2023 10:48:21 -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 1pFzoA-0006Kj-Pw for guix-patches@gnu.org; Thu, 12 Jan 2023 10:48:06 -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 1pFzoA-0008Ki-Hf for guix-patches@gnu.org; Thu, 12 Jan 2023 10:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFzoA-00089k-E0 for guix-patches@gnu.org; Thu, 12 Jan 2023 10:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60756] [PATCH 2/2] Revert "tests: Add gdm tests." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Jan 2023 15:48: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: Bruno Victal Received: via spool by 60756-submit@debbugs.gnu.org id=B60756.167353842431155 (code B ref 60756); Thu, 12 Jan 2023 15:48:02 +0000 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 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 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 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))))