From patchwork Tue Dec 13 18:35:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 45243 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 DD48E27BBE9; Tue, 13 Dec 2022 18:37:33 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 A149C27BBEB for ; Tue, 13 Dec 2022 18:37:31 +0000 (GMT) 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 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(+) base-commit: d83eef22b25a8717a62ba9d3432b7a8657b7b50b 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"