From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kGx3J2vGmGNBDgAAbAwnHQ (envelope-from ) for ; Tue, 13 Dec 2022 19:37:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 6EWCJ2vGmGMoKQAA9RJhRA (envelope-from ) for ; Tue, 13 Dec 2022 19:37:31 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4FFC6F809 for ; Tue, 13 Dec 2022 19:37:31 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5A9J-00069c-RE; Tue, 13 Dec 2022 13:37:05 -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 1p5A9G-00069I-Kw for guix-patches@gnu.org; Tue, 13 Dec 2022 13:37: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 1p5A9G-0004w9-DI for guix-patches@gnu.org; Tue, 13 Dec 2022 13:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5A9G-0003gm-8S for guix-patches@gnu.org; Tue, 13 Dec 2022 13:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60041] [PATCH] services: greetd: Add 'source-profile?' configuration field. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Dec 2022 18:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60041 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60041@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167095657114137 (code B ref -1); Tue, 13 Dec 2022 18:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Dec 2022 18:36:11 +0000 Received: from localhost ([127.0.0.1]:33914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5A8R-0003fx-4P for submit@debbugs.gnu.org; Tue, 13 Dec 2022 13:36:11 -0500 Received: from lists.gnu.org ([209.51.188.17]:41580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5A8O-0003fr-Se for submit@debbugs.gnu.org; Tue, 13 Dec 2022 13:36:09 -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 1p5A8O-0005c7-Nh for guix-patches@gnu.org; Tue, 13 Dec 2022 13:36:08 -0500 Received: from mail1.fsfe.org ([217.69.89.151]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5A8K-0004qS-Kt for guix-patches@gnu.org; Tue, 13 Dec 2022 13:36:08 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1670956560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=+aagtyfsJsgu26YPMrHp9y7zya5/+hGer7YCIYJYzMg=; b=mM83kLiyfDYkivrVzVSHG6Djx9825NggKnlR5llY9pccHIf2jSeX4UxZAUV7BtYNgwdo0D ERIqMocmxDLUkqtRb32I+Vrgb1lCYDjt/IXZvPtegMeDGnz9C457t1P9JRRQfHxGlDwKaO wgOrSYnYi+7GIUzv5pOZKpeV3oQg4Fc= Date: Tue, 13 Dec 2022 19:35:59 +0100 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.69.89.151; envelope-from=jlicht@fsfe.org; helo=mail1.fsfe.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1670956651; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=+aagtyfsJsgu26YPMrHp9y7zya5/+hGer7YCIYJYzMg=; b=udKwAM87a5f8sppNt9+4XLvGmvqnz9eYyOjIjcX0+LOfF4mccPw5UvmsrfFyob73a9UH9b SLWZRZN5bvixEZCAW0Q/WqUK5Yu4oRaUw7MLSZM0/2kqX8e1tumDEGcR7Z997UjRhF5qvA t6CCJGpV6XxWbsROW/vEPFQ7Fspt09DFwIfTbDKcOGk2Fks9ZpQO1BM1SOMoCjncxT/ivI DSjL5/AckH4Qm7TZC6baluoTq+pkzCEFSJPbBE8HxJ0iNbybl4zXcu3HdC8yQFAS87AyIM uJIMWuRlZrej+t2aSSevxcMiFPIE0Q4E1yRnCTTGqQYCKYmXwQOlMzPIhzH8HA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=mM83kLiy; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fsfe.org (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1670956651; a=rsa-sha256; cv=none; b=D6ytSM4nw48rTNH/BfgjnplP03MDZ/K2hg2e/S6jv9tRuFfnQT86PD63TKXFPRRyV0ynSG ECqx7R31lTDDimWKtPXOjed06ANmTI9MZwTItFOKf173s+IDJtEDHUFrMeE3wqw3vmIMqL nCg+aiHK1m1+Zb3sHUVmX7y56ZMOurmfqW565ESX86T3rqwFbac2Zm8nVm2WImpdJGxopb V4mdKmIJaS1wtdpnp4hbNsiCZi6VdN5G1/dw6XZ+MsjyaeTOkFNR3w/wsIqKtifygC2Qvk jbsRlXnfJMnR9mIvl31Ziu51o8d1CgTVuIrh5MAt5StaUKMjmyAMyKbcSzNz8w== X-Migadu-Spam-Score: 7.93 X-Spam-Score: 7.93 X-Migadu-Queue-Id: 4FFC6F809 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=mM83kLiy; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fsfe.org (policy=none) X-TUID: SlafCEs1RKWQ From: Jelle Licht * gnu/services/base.scm ()[source-profile?]: New field. (make-greetd-terminal-configuration-file): Serialize new field to configuration file. * doc/guix.texi (Base Services): Document it. --- doc/guix.texi | 4 ++++ gnu/services/base.scm | 3 +++ 2 files changed, 7 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index b270964542..bc71337b9c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18798,6 +18798,10 @@ Base Services @item @code{terminal-switch} (default: @code{#f}) Make this terminal active on start of @code{greetd}. +@item @code{source-profile?} (default: @code{#t}) +Whether to source @file{/etc/profile} and @file{~/.profile}, when they +exist. + @item @code{default-session-user} (default: @samp{"greeter"}) The user to use for running the greeter. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 4908af8edd..8cda1d2e16 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -3037,6 +3037,7 @@ (define-record-type* (default (default-log-file-name this-record))) (terminal-vt greetd-terminal-vt (default "7")) (terminal-switch greetd-terminal-switch (default #f)) + (source-profile? greetd-source-profile? (default #t)) (default-session-user greetd-default-session-user (default "greeter")) (default-session-command greetd-default-session-command (default (greetd-agreety-session)))) @@ -3050,12 +3051,14 @@ (define (default-log-file-name config) (define (make-greetd-terminal-configuration-file config) (let* ((config-file-name (greetd-config-file-name config)) + (source-profile? (greetd-source-profile? config)) (terminal-vt (greetd-terminal-vt config)) (terminal-switch (greetd-terminal-switch config)) (default-session-user (greetd-default-session-user config)) (default-session-command (greetd-default-session-command config))) (mixed-text-file config-file-name + "source_profile = " (if source-profile? "true" "false") "\n" "[terminal]\n" "vt = " terminal-vt "\n" "switch = " (if terminal-switch "true" "false") "\n" base-commit: d83eef22b25a8717a62ba9d3432b7a8657b7b50b -- 2.38.1