From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id yNLfB6pkxGNE6AAAbAwnHQ (envelope-from ) for ; Sun, 15 Jan 2023 21:40:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id eLzXB6pkxGNPQQEA9RJhRA (envelope-from ) for ; Sun, 15 Jan 2023 21:40:10 +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 B529131AB9 for ; Sun, 15 Jan 2023 21:40:09 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pH9nE-0001Po-9W; Sun, 15 Jan 2023 15:39:52 -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 1pH9n7-0001Ok-DB for guix-patches@gnu.org; Sun, 15 Jan 2023 15:39:45 -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 1pH9n5-0003Su-Jv for guix-patches@gnu.org; Sun, 15 Jan 2023 15:39:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pH9T4-0008Lm-3w for guix-patches@gnu.org; Sun, 15 Jan 2023 15:19:02 -0500 Subject: bug#60041: [PATCH] services: greetd: Add 'source-profile?' configuration field. In-Reply-To: Resent-From: Jelle Licht Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 15 Jan 2023 20:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 60041 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60041-done@debbugs.gnu.org Cc: jlicht@fsfe.org Mail-Followup-To: 60041@debbugs.gnu.org, jlicht@fsfe.org, jlicht@fsfe.org Received: via spool by 60041-done@debbugs.gnu.org id=D60041.167381391932064 (code D ref 60041); Sun, 15 Jan 2023 20:19:01 +0000 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= 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-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-Seal: i=1; s=key1; d=yhetil.org; t=1673815209; a=rsa-sha256; cv=none; b=SjCoaW32ME0XZaRoOh6/Ni+Cqu6OXWYagwGT4fmViBnwDirHLzUXmv1IWo0f+LhB8DKPgd wSAGv8XsH2BuXxLmyXNE9vk6IUPyY8dB+/gYXo1nwubv9EWFxQ2gF7M8XaFXdJ841KnQET ByyQgI1Uq2Ihtl5nde6pYAek6iXU97odP1wMSW6xbqnffPi44yWdsqAyE+zuPLFiRY9AY8 JKK7Bp4pVf7eUW89JxmMw0v+5ZdSi168BB0mJdu9q4klnZVmR3bfRDNZAzIr0csOvr5AaF C6B9/Xpfw/z7hk1FYUtX7OaKZvtQeWIUCzHRlYhgR++W4umN8XwE67u1m4vzbg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=BYJQ9PvZ; 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673815209; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=BLsEWqcAULSOaoIlLF1z/oypCNIO1TzfkTgmIUyXWCo=; b=AYCnSvs00JqaYDV2VewM5aANi2D7RscdLy3soRNW0R4vzJaqJOZQs9bJvvu4BFfn2i6vJ+ 5DEjWNbdvHdPjKLRPqUNvYmv/hkl5lkSVWOrZdXgtb1jbHLvv3ioNIYwUOz9LooBrtVGNX wk+5ByObNJ6nte3e/9kaptT5u1zmkfRyvYkaGa805OLilrLvr0yQeSYarLvkUCSyM8wQk4 XKW/q+uRaLz36DXv50BuF+lvM1yl3bdTwzgaCqzSGIMSCTqR+P0CBSS4hY0A8ZydYOImJ1 Xi2V+Gf9K/SrAqKJXUXgAYiYsQLyQq6VMoWE7K7tZUXXk3wOMhhpRQT1vtvW+g== X-Migadu-Spam-Score: -2.02 X-Spam-Score: -2.02 X-Migadu-Queue-Id: B529131AB9 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=BYJQ9PvZ; 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: F+hxlq6els0o 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