From patchwork Sun Dec 31 11:39:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58241 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 7FC4C27BBEA; Sun, 31 Dec 2023 11:41:30 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS 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 0E1A727BBE2 for ; Sun, 31 Dec 2023 11:41:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJuBj-0001Zr-4s; Sun, 31 Dec 2023 06:41:03 -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 1rJuBi-0001ZY-3f for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:02 -0500 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 1rJuBh-0003j7-R0 for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJuBi-0004VJ-Tc for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68169] [PATCH 1/9] system: Export default bash-profile. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 11:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68169@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 68169-submit@debbugs.gnu.org id=B68169.170402281617117 (code B ref 68169); Sun, 31 Dec 2023 11:41:02 +0000 Received: (at 68169) by debbugs.gnu.org; 31 Dec 2023 11:40:16 +0000 Received: from localhost ([127.0.0.1]:45718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuAy-0004S0-1r for submit@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:16 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:42130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuAt-0004Rg-Je for 68169@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:15 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-336746a545fso4613595f8f.0 for <68169@debbugs.gnu.org>; Sun, 31 Dec 2023 03:40:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704022804; x=1704627604; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=HTi8qsLlJB/RG+Bh9mDjcjEy7Ua4yLDFvPBulEVynHU=; b=M8jWVchd2MX7hOYl3mkyTGFKXBTqHBJAc7lB3HSeBgwW42oKY/NIvWHMBZW/lD0UON yPayK3VJNQMY8d1qwoVZU2xQ+pxIjRxXF6K4DCyZaz++1Oob6FXr3vicftbtfNctfDUl O75NBTJaRkL646oUltO3Jeq3gqo9ON6x4rzEr3w0I/adp0LM0ReThyH/cDyiddn7k0Vc ONQxerYUyn588EEXwPXfFm+o2jMOZG9aXGXsItDBAhcB99ZABa7a3Ynol0dWX9s9qZcW BW3lsh1DUadb0cHS8yWmzmLvhIRt1oj3LRbQDYAtYJEMS8CUFcBYMq4W0N6um9hde+ZX WgTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704022804; x=1704627604; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=HTi8qsLlJB/RG+Bh9mDjcjEy7Ua4yLDFvPBulEVynHU=; b=VEO/RTvkuNs73QdcXkfROKcJW5Hb6MLHYaVIBSKA2rg6TPuFtMd6Y2OrdkMKV3cSUv UQoJDGoAXE+aXT/ES3ZCz8yvxrHn66NrBGutSFoVnXnmvUPsQvDf/oCd7ie5FXaFdNrR MOncgrlTcgdDRtZWdU59Mp8M4AdTpiSQCcn8wmSwQwXnCbdbgGDZ5vbRz3wfsFygN3hL 3q2gP45XrnDKrJLyzWul0EGFpMaukfYgBrRUcCcMlsooWf2yj+8cFREupgVNmKaI7x3s pt1fWzaydGnAUS+5RfP1TBzzit5bWbeqLLQXPUW6SRgAJWhGbAdmEzrFML4i0OR9crm2 11ZQ== X-Gm-Message-State: AOJu0YzlIGxfxj9Vu3zDVd7VeSNHWTj7qkWgoigBjzt26zNS59GjGvWr CpAI2UpAgJT6SjO0xSt4yFbkpICaJLD8dQ== X-Google-Smtp-Source: AGHT+IEPYHMsNdps8Iv8qQN/2f3BjmLR6xFZYpI6Sg+J3Ku+pSkXROa++CllNkEHp2+zEyWLxDuwUQ== X-Received: by 2002:adf:fe06:0:b0:336:6dbe:f6c8 with SMTP id n6-20020adffe06000000b003366dbef6c8mr7391579wrr.12.1704022804237; Sun, 31 Dec 2023 03:40:04 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id i2-20020adffc02000000b003364aa5cc13sm23627055wrr.1.2023.12.31.03.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:40:03 -0800 (PST) From: Efraim Flashner Date: Sun, 31 Dec 2023 13:39:40 +0200 Message-ID: <46f070e31135c8fe39b28cef4c58e54ec99d5f13.1704021933.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 gnu/system/shadow.scm (%default-bash-profile): Extract from default-skeletons, export. (default-skeletons): Use %default-bash-profile. Change-Id: I45641b1091daee3495a5f92bdc1a63050e0cc59e --- gnu/system/shadow.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 47f19551b6..cd4e1a9156 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -64,6 +64,7 @@ (define-module (gnu system shadow) user-group-system?) #:export (%default-bashrc + %default-bash-profile default-skeletons skeleton-directory %base-groups @@ -147,11 +148,8 @@ (define %default-bashrc alias grep='grep --color=auto' alias ip='ip -color=auto'\n")) -(define (default-skeletons) - "Return the default skeleton files for /etc/skel. These files are copied by -'useradd' in the home directory of newly created user accounts." - - (let ((profile (plain-file "bash_profile" "\ +(define %default-bash-profile + (plain-file "bash_profile" "\ # Set up Guix Home profile if [ -f ~/.profile ]; then . ~/.profile; fi @@ -167,6 +165,12 @@ (define (default-skeletons) # Prepend setuid programs. export PATH=/run/setuid-programs:$PATH ")) + +(define (default-skeletons) + "Return the default skeleton files for /etc/skel. These files are copied by +'useradd' in the home directory of newly created user accounts." + + (let ((profile %default-bash-profile) (bashrc %default-bashrc) (zprofile (plain-file "zprofile" "\ # Honor system-wide environment variables