From patchwork Mon May 5 10:04:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 42323 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 70A2327BC4B; Mon, 5 May 2025 11:05:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 579F827BC49 for ; Mon, 5 May 2025 11:05:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBshF-0004CJ-Bj; Mon, 05 May 2025 06:05:14 -0400 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 1uBsh9-0004B8-31 for guix-patches@gnu.org; Mon, 05 May 2025 06:05:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uBsh4-0006db-Ry for guix-patches@gnu.org; Mon, 05 May 2025 06:05:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=co1+8MjUjM1D0jUhwXPcik9EBPQN/UxW6XpFjAgdEqI=; b=FdLRwm8PyC9qMzjDfS06Tt6jzEKyoRW6sE5gc06RpiiJZN6Ry6d5YTXiHc3RlytWhSv1z6pRxFJllUTz2OoYUKcWQf7zQJssSS5CEoj4EoUijk7oMJesynYsOtsNebp5L/qhvPg1NsoMeKOalYyTP4pP0//50HVaX0lSmBJUDWAboFpKwb7+zNHI0VS+o0ZJGbFVxLcJfdZS45taFT9m+akLESz9osic2LW5gjb26F4AikGp3u2HdL7gPQ55R5tbkJLbqOlOK3vOBqwCUSpwNufOBFAx1oxeptF+7aGPEpzRt4Dl6pyLzNjjxzatFsXbWscub+31ryuq9j3aKKkPmQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBsh4-0006oU-FS for guix-patches@gnu.org; Mon, 05 May 2025 06:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78258] [PATCH] services: xorg: Make startx respect XDG_VTR. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 May 2025 10:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78258@debbugs.gnu.org Cc: Sergey Trofimov X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174643949126145 (code B ref -1); Mon, 05 May 2025 10:05:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 May 2025 10:04:51 +0000 Received: from localhost ([127.0.0.1]:38850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBsgt-0006nc-4u for submit@debbugs.gnu.org; Mon, 05 May 2025 06:04:51 -0400 Received: from lists.gnu.org ([2001:470:142::17]:44206) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uBsgq-0006n9-Tt for submit@debbugs.gnu.org; Mon, 05 May 2025 06:04:49 -0400 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 1uBsgg-00042W-Fa for guix-patches@gnu.org; Mon, 05 May 2025 06:04:38 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uBsge-0006b3-NV for guix-patches@gnu.org; Mon, 05 May 2025 06:04:38 -0400 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-5e5c7d6b96fso7826858a12.3 for ; Mon, 05 May 2025 03:04:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1746439473; x=1747044273; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=co1+8MjUjM1D0jUhwXPcik9EBPQN/UxW6XpFjAgdEqI=; b=O223kYvWd2F43zBcFyVjw1Y3YVh0JTt/Wb7wXKAQEhktS2H26Xhnazq2YpvbegTX+I QdBRkxoE+XPh7zrTTA66R+WP+9mZq1q4uS3elxGvQM7wMh0TxS45JiyxBXOaIuR/HsKu RQ/1dkz0rtrJXhnrcvoRFFPu1wkpxZaiqnQpWUOqUtVvYa/6mYTRKlxzHMEaktnXTZI4 4J01RcaxNxNuB7QjQ6GOt5Yvjg1aMI8jPADdwVdXwH13m+/Umzdlvw70/XcfKUVql7mR DVjTY9Bnt65qmaqRsQgD+jZGsQ8IDsiXFUuF8swp8R80uJKeuhRZzp5nW+EHkgMsZDev rVFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746439473; x=1747044273; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=co1+8MjUjM1D0jUhwXPcik9EBPQN/UxW6XpFjAgdEqI=; b=C1ZoNEgnNUgFu1JpBdpLD52gL5U2qP/8FS8UX8T3eA1+pUuVqotcEDInYmzWmS6yxn tIT7qTxhBJ/IDK2wRtkl8GbB08JvS45DAxRuCkMCdyVNGvm/RLIDcwCspYIBQ30q1DPM dnanR4uYoQqveHLnAXcE7uisw5nhRzfexAnWnbt5i5uOpEq63Kq+XvbvSfSImbC238bU TNUz3hmw9fY6M4/PXHvpKaK21gX3ok169rYqkDWnXDXmNv7uAjkli0XuNqaJn5ysACke 8l9VPNLgwOMnJrH3KGUJu5XGBd3dbIqcRxGX2zt08PsyrW1R/ifQttHD7Mon7mfHYXiI 5ujw== X-Gm-Message-State: AOJu0YzuPN7NzSoQsOzUVbs0XmQp7JVdXfUSemqjpnVCZrVp1k9HpAOu umn8sSWrnserDTRe7Ui2nXPtj/jR32nZzNfevdS7RmiGtF1XH6xzdUk/p0EBROOfMg1t63pu3XR UfTw= X-Gm-Gg: ASbGncsmk7VNC1GNHXzH3SycY6fCFNnT7ksgG9kxnzNl9n5l7ADMhqRgSiFn6qmCB1n fUwD1lX6W3KYhDYude0nKeoKr8Tp8Go6stGN33/ctZBy9HPoatRKTvr+Z4Kf4ByGkxmdI/ER/ev NADLzz5cDFpilIc1ZX6xKb9v2yf90KrWOoOV5KmKU6QfuKsw579PU+rQfkeXv+h7JXSNkq6p5EM 5Zeyy1GRFJaCxMXZ0K4SuAH97dlmkL9Fs6o+esWim2G3kfRX/dI7ellKfRUlmcCKRS1+dOQUQJ6 7ccZ3p0S0VLWGOA/ccoVrO61TikP90R35ScYaG6xDuvdHzL9 X-Google-Smtp-Source: AGHT+IGKFeiZl1Rd5T6hX/QqY0Pj2OigJLbsa+TspX9hw7vRsPMeqigkg5bpIP10Ly2i1/GVutfdiw== X-Received: by 2002:a05:6402:2351:b0:5e5:bdfe:6bfb with SMTP id 4fb4d7f45d1cf-5fab057b024mr4909436a12.16.1746439473239; Mon, 05 May 2025 03:04:33 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5fa9e67f561sm4135323a12.63.2025.05.05.03.04.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 03:04:32 -0700 (PDT) Date: Mon, 5 May 2025 12:04:28 +0200 Message-ID: <93be588d52bef9f3e4c6495cebc60136cad1a748.1746439456.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=sarg@sarg.org.ru; helo=mail-ed1-x52d.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: , Reply-to: Sergey Trofimov X-ACL-Warn: , Sergey Trofimov via Guix-patches X-Patchwork-Original-From: Sergey Trofimov via Guix-patches via From: Sergey Trofimov 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 To allow X server to be started by shepherd, without resorting to login managers, the determine-vty procedure has to be adjusted. Shepherd would as set /proc/self/fd/0 to /dev/null when starting the service, so the TTY has to be extracted by other means. * gnu/services/xorg.scm (xorg-start-command-xinit): Use XDG_VTR environment variable to determine VTY. Change-Id: I390217e292f6534b31d18083c9a49c009a836aad --- gnu/services/xorg.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) base-commit: 17119f1a35b7bff683f2f8f2b5db09b4634283e6 prerequisite-patch-id: f9cc903b8048c8c6fde576fbf38ab110263020e3 prerequisite-patch-id: b6d30068ce4971d4d8e67517229916df4e76c529 prerequisite-patch-id: a7d0b89bff79773111c364edcd67265df55a0234 prerequisite-patch-id: c99e71b3eaa726b8ecf2d9b782d5a6a51476e702 prerequisite-patch-id: a3f8e48f417d7a17d9db12e950354a0220dc52f3 prerequisite-patch-id: 8456c216a2d8dd3d6c403243c0d9452fbb138ecf prerequisite-patch-id: 95bb686bc7dc0961b89a2900a368f270de065d94 prerequisite-patch-id: f56033bf148a2fdfb5d9321315bdff877ebdb7ba diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index bef05b9bb9..d5d7ffbc4c 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -451,13 +451,17 @@ (define* (xorg-start-command-xinit #:optional (config (xorg-configuration))) (eq? 'socket (stat:type (stat sock-file))))) (determine-unused-display (+ n 1)) (format #f ":~a" n)))) - (define (determine-vty) + + (define (vty-from-fd0) (let ((fd0 (readlink "/proc/self/fd/0")) (pref "/dev/tty")) (if (string-prefix? pref fd0) - (string-append "vt" (substring fd0 (string-length pref))) + (substring fd0 (string-length pref)) (error (format #f "Cannot determine VT from: ~a" fd0))))) + (define (determine-vty) + (string-append "vt" (or (getenv "XDG_VTNR") (vty-from-fd0)))) + (define (enable-xauth server-auth-file display) ;; Configure and enable X authority (or (getenv "XAUTHORITY")