From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:700:3204::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id ACJfC2lTkWWkaAEAkFu2QA (envelope-from ) for ; Sun, 31 Dec 2023 12:41:29 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id qDuPBWlTkWXUegAAe85BDQ (envelope-from ) for ; Sun, 31 Dec 2023 12:41:29 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=M8jWVchd; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704022889; 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: content-transfer-encoding:content-transfer-encoding:resent-cc: 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=HTi8qsLlJB/RG+Bh9mDjcjEy7Ua4yLDFvPBulEVynHU=; b=KaP1slyfths3Vo1RJi1b26ZcmajXQRf9Tts9OP3XdoqgIQu8TkjZVbVS9GWx07PFuNWiPi /Tkog62bJJiOjPXknI4A3XxhgbHh/zWpfEi+hjqSw671CBJSjD8dhuAxBHNykLD7w38QTH pQa4IGMOMcwt1rr2QEsTvV5MGkFOzUe0YDIh4fuEOXoXgAC+qPhSlY44l78OLgKVHlI9yu 1cOKPj6v8x0D1vlfVeEi5QbRsqgt2e1sDvvzSAZZIK33ocAlyJDsfKImIveAtx53kXM499 3l+V/UkTPbbC1swYIdrWDqjWN7VHmU0+yegPFAT2PPibfIG6vCSHUoEDhHHV1Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=M8jWVchd; 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=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704022889; a=rsa-sha256; cv=none; b=MissqrN2mNOQ2CxauoPevUjxbS5Qp2757l0T6XJhbg7WsAdD4E/IGjtWtcH9JjEYIo24iM OQfHjPWyacPyX7a3eGFbh/DTD69+IMJL06YRiLv+tvdSaWC9jECqEv776s+X6rKtPwp6HB iFEaBJ7m6PlXzKE1EvEC+vpH+dXdCfd2VN9p1jrWfGr1/Ud+Ti9tOONjNGJ4S5wrXb4O5u /dWQFhLauCIHSVfbqUSn5wGZJq7zJxJSs+KFNIFRgCxfLYlFdqpNy8+ZoBg63oCbQ+4sHv 6/XvgAGPprWtWkoNn0AVn43gZDE6j7CX3WnR1+jJyTzRnjumZDg9KdxAxDjFgQ== 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 EA7301075C for ; Sun, 31 Dec 2023 12:41:28 +0100 (CET) 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -4.25 X-Spam-Score: -4.25 X-Migadu-Queue-Id: EA7301075C X-TUID: d4x8Nstmnler 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 -- Efraim Flashner רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted