diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-05-18 10:08:55 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-05-18 10:55:16 +0200 |
| commit | 41f76ae08a7a830cdeb1eaac271d714cb58fbce3 (patch) | |
| tree | f43d38cdd14456d698bbd09927e78cb6fe383f30 /gnu/build/activation.scm | |
| parent | a20e00ddaf343c8bebc608ebe59c4204deb065d1 (diff) | |
services: user-homes: Do not create home directories marked as no-create.
Fixes a bug whereby GuixSD would create the /nonexistent directory, from
user 'nobody', even though it has 'create-home-directory?' set to #f.
* gnu/build/activation.scm (activate-users+groups): Add comment for
\#:create-home?.
(activate-user-home)[ensure-user-home]: Skip when CREATE-HOME? is #f or
SYSTEM? is #t.
* gnu/tests/base.scm (run-basic-test)["no extra home directories"]: New
tests.
Diffstat (limited to 'gnu/build/activation.scm')
| -rw-r--r-- | gnu/build/activation.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index beee56d4379..a1d2a9cc7d1 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm | |||
| @@ -227,7 +227,11 @@ numeric gid or #f." | |||
| 227 | #:supplementary-groups supplementary-groups | 227 | #:supplementary-groups supplementary-groups |
| 228 | #:comment comment | 228 | #:comment comment |
| 229 | #:home home | 229 | #:home home |
| 230 | |||
| 231 | ;; Home directories of non-system accounts are created by | ||
| 232 | ;; 'activate-user-home'. | ||
| 230 | #:create-home? (and create-home? system?) | 233 | #:create-home? (and create-home? system?) |
| 234 | |||
| 231 | #:shell shell | 235 | #:shell shell |
| 232 | #:password password) | 236 | #:password password) |
| 233 | 237 | ||
| @@ -282,7 +286,10 @@ they already exist." | |||
| 282 | (match-lambda | 286 | (match-lambda |
| 283 | ((name uid group supplementary-groups comment home create-home? | 287 | ((name uid group supplementary-groups comment home create-home? |
| 284 | shell password system?) | 288 | shell password system?) |
| 285 | (unless (or (not home) (directory-exists? home)) | 289 | ;; The home directories of system accounts are created during |
| 290 | ;; activation, not here. | ||
| 291 | (unless (or (not home) (not create-home?) system? | ||
| 292 | (directory-exists? home)) | ||
| 286 | (let* ((pw (getpwnam name)) | 293 | (let* ((pw (getpwnam name)) |
| 287 | (uid (passwd:uid pw)) | 294 | (uid (passwd:uid pw)) |
| 288 | (gid (passwd:gid pw))) | 295 | (gid (passwd:gid pw))) |
