diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-04-17 12:48:06 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-04-17 23:18:32 +0200 |
| commit | 1e7281108be5fc37daa4cc180e0effdeb4c1a960 (patch) | |
| tree | e3e145de15685fa91a72e1e4f90ff8ee3463b02a /gnu/system | |
| parent | 10c413685f13af12fa2bb34796db82e1f52b47af (diff) | |
services: account: Have 'user-processes' depend on 'user-homes'.
Until now, 'user-homes' happened to start right after 'user-processes'
and before services that depend on a home directory but the dependency
was not explicit. This addresses it.
* gnu/system/shadow.scm (account-service-type): Extend
USER-PROCESSES-SERVICE-TYPE.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/shadow.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 42480e823c5..a6f1d806cf4 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> | 3 | ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> |
| 4 | ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 4 | ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> |
| 5 | ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> | 5 | ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> |
| @@ -314,9 +314,7 @@ accounts among ACCOUNTS+GROUPS." | |||
| 314 | ;; | 314 | ;; |
| 315 | ;; XXX: We arrange for this service to stop right after it's done its job so | 315 | ;; XXX: We arrange for this service to stop right after it's done its job so |
| 316 | ;; that 'guix system reconfigure' knows that it can reload it fearlessly | 316 | ;; that 'guix system reconfigure' knows that it can reload it fearlessly |
| 317 | ;; (and thus create new home directories). The cost of this hack is that | 317 | ;; (and thus create new home directories). |
| 318 | ;; there's a small window during which first-time logins could happen before | ||
| 319 | ;; the home directory has been created. | ||
| 320 | (list (shepherd-service | 318 | (list (shepherd-service |
| 321 | (requirement '(file-systems)) | 319 | (requirement '(file-systems)) |
| 322 | (provision '(user-homes)) | 320 | (provision '(user-homes)) |
| @@ -374,6 +372,11 @@ the /etc/skel directory for those." | |||
| 374 | account-activation) | 372 | account-activation) |
| 375 | (service-extension shepherd-root-service-type | 373 | (service-extension shepherd-root-service-type |
| 376 | account-shepherd-service) | 374 | account-shepherd-service) |
| 375 | ;; Have 'user-processes' depend on 'user-homes' so that | ||
| 376 | ;; daemons start after their home directory has been | ||
| 377 | ;; created. | ||
| 378 | (service-extension user-processes-service-type | ||
| 379 | (const '(user-homes))) | ||
| 377 | (service-extension etc-service-type | 380 | (service-extension etc-service-type |
| 378 | etc-files))))) | 381 | etc-files))))) |
| 379 | 382 | ||
