From unknown Fri Sep 19 23:54:01 2025 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-Spam-Score: -1.3 (-) 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 (--) 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 From unknown Fri Sep 19 23:54:01 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: jlicht@fsfe.org Subject: bug#60041: closed (Re: bug#60041: [PATCH] services: greetd: Add 'source-profile?' configuration field.) Message-ID: References: <87fscbzh4d.fsf@fsfe.org> X-Gnu-PR-Message: they-closed 60041 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 60041@debbugs.gnu.org Date: Sun, 15 Jan 2023 20:19:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1673813942-32095-1" This is a multi-part message in MIME format... ------------=_1673813942-32095-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #60041: [PATCH] services: greetd: Add 'source-profile?' configuration field. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 60041@debbugs.gnu.org. --=20 60041: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D60041 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1673813942-32095-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 60041-done) by debbugs.gnu.org; 15 Jan 2023 20:18:39 +0000 Received: from localhost ([127.0.0.1]:59601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pH9Sh-0008L5-GW for submit@debbugs.gnu.org; Sun, 15 Jan 2023 15:18:39 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:32806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pH9Se-0008Kr-Hc for 60041-done@debbugs.gnu.org; Sun, 15 Jan 2023 15:18:37 -0500 From: Jelle Licht DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1673813907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=BLsEWqcAULSOaoIlLF1z/oypCNIO1TzfkTgmIUyXWCo=; b=BYJQ9PvZWzv5JMl2qV1JtoJhvAxau+cscaeFXuqmr0eXLK/aMVqEGcZqN5xe9DEwAqitLv nSLSfo3qGq19F0yhbhwe+cI6SnKCl17/te/6Iei3tQSmWw2jEtk7qvU5zMIsJCX/6KUKYC aZCo1N9482bdnCQgIVeAuZxyehRQsEA= To: 60041-done@debbugs.gnu.org Subject: Re: bug#60041: [PATCH] services: greetd: Add 'source-profile?' configuration field. References: Date: Sun, 15 Jan 2023 21:18:26 +0100 Message-ID: <87fscbzh4d.fsf@fsfe.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60041-done Cc: jlicht@fsfe.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 (-) jlicht@fsfe.org writes: > 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 Applied as a5b914156eda876000ecab29ebe855080f8d8ff6 on master. - Jelle ------------=_1673813942-32095-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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= To: guix-patches@gnu.org Subject: [PATCH] services: greetd: Add 'source-profile?' configuration field. 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit 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 (--) 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 ------------=_1673813942-32095-1--