diff mbox series

[bug#68169,1/9] system: Export default bash-profile.

Message ID 46f070e31135c8fe39b28cef4c58e54ec99d5f13.1704021933.git.efraim@flashner.co.il
State New
Headers show
Series Add guix-home config to /etc/skel | expand

Commit Message

Efraim Flashner Dec. 31, 2023, 11:39 a.m. UTC 
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 mbox series

Patch

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