From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 4EyfODnfZGRSiwAASxT56A (envelope-from ) for ; Wed, 17 May 2023 16:05:45 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id eAB3ODnfZGTERwEA9RJhRA (envelope-from ) for ; Wed, 17 May 2023 16:05:45 +0200 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 8BCB359BA for ; Wed, 17 May 2023 16:05:45 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzHm5-0001O3-Re; Wed, 17 May 2023 10:05:05 -0400 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 1pzHm2-0001MV-MA for bug-guix@gnu.org; Wed, 17 May 2023 10:05:02 -0400 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 1pzHm2-0001wK-91 for bug-guix@gnu.org; Wed, 17 May 2023 10:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzHm2-0002BF-4J for bug-guix@gnu.org; Wed, 17 May 2023 10:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#20255: [PATCH 2/4] system: default-skeletons: Set up Guix home profile when it exists. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 17 May 2023 14:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20255 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 20255@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 20255-submit@debbugs.gnu.org id=B20255.16843322718285 (code B ref 20255); Wed, 17 May 2023 14:05:02 +0000 Received: (at 20255) by debbugs.gnu.org; 17 May 2023 14:04:31 +0000 Received: from localhost ([127.0.0.1]:50522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzHlW-00029X-PL for submit@debbugs.gnu.org; Wed, 17 May 2023 10:04:31 -0400 Received: from mail.envs.net ([5.199.136.28]:38266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzHlS-00029F-MN for 20255@debbugs.gnu.org; Wed, 17 May 2023 10:04:28 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 2DC8638A1439; Wed, 17 May 2023 14:04:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1684332266; bh=fXzUDy4nn4XdKVH499mSkR5xnOdrJd0XoMTmJ0KtnWA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nvL+K3p3xryqJGhkPw2swlEQpRt34bvnC6pavTw07dBKFjDqkgDr3Dg8iCRkJyeYJ 2omxP5z/ueJ+CkSEsb53ODO8jElDNj450rK1wNT0xs8dBZset32L5FLlwN5jkYZBNe JjaItTiIq1f0J7LtAcqxN6+Yq38ZIgVVs1icocS3Uww+XtkxwSV/90Hbp3kbEwxKmd N21/U6wSTEzefihpcpomtFL0BoLhCD3VgsC91VVKpTMVzHHnECOVxED+lENbtnLCph qnoVQFEtZj9QBtDho2CJiawquDwTMqMOTMAQv2PK+6Izejor1VHTtRqdTVU+PXudTB 5eBfBR540tTEzGtulo9KzNRWOevEjqHGNR+aG2wlFW+a1tWQdr1v4c81tVsvZr8/9f k+1eNWVKWBOdgmlpT66jg3qYcHQDwWHoRGHCOoBCKwkX/GoA2HXh1VJPxwcN+sa1qO xfVnVmowNEyfZP2NOMfJPX00h8S37gu5sgDbZ0Xp9HN14/LIQKDxH1fcsRMY87WGMJ n/3gz9dcPW06ZOyrfoLzs7/ctDhsfcxxbPgPzAej4ejJlAZf1rYggfdyyV//iQjXp4 0PnaZdkfgJHgYDSHuC5Nmkwd8jbtStlXTkQ5nKv0LOVF0a67HroA0W+178QerJYblk 8nXrdXylA0z2kkuvYwrSSSug= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ckkuy8kskZKi; Wed, 17 May 2023 14:04:23 +0000 (UTC) Received: from localhost (unknown [36.170.57.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Wed, 17 May 2023 14:04:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 07513384; Wed, 17 May 2023 14:04:18 +0000 (UTC) Date: Wed, 17 May 2023 22:04:09 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <10665650174637a1b70629b864509a0a68920154.1684331588.git.iyzsong@member.fsf.org> References: <10665650174637a1b70629b864509a0a68920154.1684331588.git.iyzsong@member.fsf.org> 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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: iyzsong@envs.net From: iyzsong--- via Bug reports for GNU Guix Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-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=1684332345; a=rsa-sha256; cv=none; b=K8ZY4zdFR0+4PRZpd+Z+rtv7TDopB6tyHwbjizmKrZtEwbcnfLFp/WGmShUV84152GI+fj qP4KaZGP1pVZ32fmg3jQcqDNqPnNd8KAdBZL6Z32LAEXheXCyv/Ka5bHsNVTRvIvMKzxFP MJywDw9rRpgadSYY3F+DgiscBtDBktJRrWIcArlAXV4df8ZZk3BgBEmtAIt/wEHG78N6qU /nPGe78oZIUCFuuuLXi7FtYS2w+Ayt6rd3wFRlAYQzylgohdkW6cMokwKeFSqwqnAyIF0u JVxq4ko1+Z4DQxsuZ5eK6TAXKVtRf18YFMovrPdBGpLd5xuI4x8C0bJP5h65jQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=nvL+K3p3; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1684332345; h=from:from:sender:sender:reply-to: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=fXzUDy4nn4XdKVH499mSkR5xnOdrJd0XoMTmJ0KtnWA=; b=JkWfcMTZrMoBq2O/55pJ3BFUfAaYJhSF8B7bgEJ7+cuZWpzpm7GWMhkw1EMmn0opDqxO9J W8JdNwAFjqUBE00tyEc7u08OcZSnxBzD2nENmGi2Znwtz/1aahx8uiSlfeVGLTZ43ZF5SE npkW85SifppU72kXRCOj6gL7ZcnmKaFsQuvtpdT1EjBOSxL1Ers8XTzxZs7oX7nG1gcvOo U+gMienFs1ataU23h/jAO2dfcrI/VyAWWqCtsGDESPtAVgJ9DgbroLYojDB2k7eaZG+j/f wbceQy+gmU+xHI/5Z18RXH9e8PUrIPX6+WsbEcoWbekfACWtEZqPTbnjuzLwrg== X-Migadu-Spam-Score: -1.41 X-Spam-Score: -1.41 X-Migadu-Queue-Id: 8BCB359BA X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=nvL+K3p3; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-TUID: MFeWTwOygbwm From: 宋文武 This is a followup to 40310efde9b4a4f2cf98081d6cd10f843685ebb6. * gnu/system/shadow.scm (default-skeletons)[bash_profile, zprofile]: Source '~/.profile' when '~/.guix-home' exists. --- gnu/system/shadow.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 4a8cc87f0f..afb47fc42d 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -151,9 +151,6 @@ (define (default-skeletons) 'useradd' in the home directory of newly created user accounts." (let ((profile (plain-file "bash_profile" "\ -# Set up Guix Home profile -if [ -f ~/.profile ]; then . ~/.profile; fi - # Honor per-interactive-shell startup file if [ -f ~/.bashrc ]; then . ~/.bashrc; fi @@ -165,6 +162,9 @@ (define (default-skeletons) # Prepend setuid programs. export PATH=/run/setuid-programs:$PATH + +# Set up Guix Home profile +if [ -d ~/.guix-home ]; then . ~/.profile; fi ")) (bashrc %default-bashrc) (zprofile (plain-file "zprofile" "\ @@ -179,6 +179,9 @@ (define (default-skeletons) # Prepend setuid programs. export PATH=/run/setuid-programs:$PATH + +# Set up Guix Home profile +if [ -d ~/.guix-home ]; then . ~/.profile; fi ")) (xdefaults (plain-file "Xdefaults" "\ XTerm*utf8: always -- 2.40.1