diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-12-31 10:25:17 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-01-17 11:11:09 +0200 |
| commit | 6a9e4b063917240c8c4bf412db47f7e07df39732 (patch) | |
| tree | ef182c46c7d61a803d0f6c40c2203714261dd1fe | |
| parent | cdcb2e78d26297215ae9382b57ca3832d16b4824 (diff) | |
system: Export default zprofile.
* gnu/system/shadow.scm (%default-zprofile): Extract from
default-skeletons, export.
(default-skeletons): Use %default-zprofile.
Change-Id: I6c6e158bca2e462a2eae709fbc2c25a2c7f3f8b4
| -rw-r--r-- | gnu/system/shadow.scm | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index cd4e1a9156a..9b1678c54dd 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm | |||
| @@ -65,6 +65,7 @@ | |||
| 65 | 65 | ||
| 66 | #:export (%default-bashrc | 66 | #:export (%default-bashrc |
| 67 | %default-bash-profile | 67 | %default-bash-profile |
| 68 | %default-zprofile | ||
| 68 | default-skeletons | 69 | default-skeletons |
| 69 | skeleton-directory | 70 | skeleton-directory |
| 70 | %base-groups | 71 | %base-groups |
| @@ -166,13 +167,8 @@ eval \"$(guix package --search-paths \\ | |||
| 166 | export PATH=/run/setuid-programs:$PATH | 167 | export PATH=/run/setuid-programs:$PATH |
| 167 | ")) | 168 | ")) |
| 168 | 169 | ||
| 169 | (define (default-skeletons) | 170 | (define %default-zprofile |
| 170 | "Return the default skeleton files for /etc/skel. These files are copied by | 171 | (plain-file "zprofile" "\ |
| 171 | 'useradd' in the home directory of newly created user accounts." | ||
| 172 | |||
| 173 | (let ((profile %default-bash-profile) | ||
| 174 | (bashrc %default-bashrc) | ||
| 175 | (zprofile (plain-file "zprofile" "\ | ||
| 176 | # Honor system-wide environment variables | 172 | # Honor system-wide environment variables |
| 177 | source /etc/profile | 173 | source /etc/profile |
| 178 | 174 | ||
| @@ -185,6 +181,14 @@ eval \"$(guix package --search-paths \\ | |||
| 185 | # Prepend setuid programs. | 181 | # Prepend setuid programs. |
| 186 | export PATH=/run/setuid-programs:$PATH | 182 | export PATH=/run/setuid-programs:$PATH |
| 187 | ")) | 183 | ")) |
| 184 | |||
| 185 | (define (default-skeletons) | ||
| 186 | "Return the default skeleton files for /etc/skel. These files are copied by | ||
| 187 | 'useradd' in the home directory of newly created user accounts." | ||
| 188 | |||
| 189 | (let ((profile %default-bash-profile) | ||
| 190 | (bashrc %default-bashrc) | ||
| 191 | (zprofile %default-zprofile) | ||
| 188 | (xdefaults (plain-file "Xdefaults" "\ | 192 | (xdefaults (plain-file "Xdefaults" "\ |
| 189 | XTerm*utf8: always | 193 | XTerm*utf8: always |
| 190 | XTerm*metaSendsEscape: true\n")) | 194 | XTerm*metaSendsEscape: true\n")) |
