diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-06-21 15:52:26 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-21 15:52:26 +0200 |
| commit | 4dfea1010af3f00d424fe85384957d6405c8786e (patch) | |
| tree | 604058bd34f49d43a9eadf324dfef29938760012 /gnu/system.scm | |
| parent | b7a46ed22764db9097aba96e68143d46b2a75be0 (diff) | |
| parent | a34801ca685df32e1df50597a96a578acb66cfb0 (diff) | |
| download | guix-4dfea1010af3f00d424fe85384957d6405c8786e.tar guix-4dfea1010af3f00d424fe85384957d6405c8786e.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index d367307a24..84eab5f84f 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -470,13 +470,13 @@ a container or that of a \"bare metal\" system." (cons* (service system-service-type entries) %boot-service - ;; %SHEPHERD-ROOT-SERVICE must come first so that the gexp that + ;; %SHEPHERD-ROOT-SERVICE must come last so that the gexp that ;; execs shepherd comes last in the boot script (XXX). Likewise, - ;; the cleanup service must come last so that its gexp runs before + ;; the cleanup service must come first so that its gexp runs before ;; activation code. - %shepherd-root-service - %activation-service (service cleanup-service-type #f) + %activation-service + %shepherd-root-service (pam-root-service (operating-system-pam-services os)) (account-service (append (operating-system-accounts os) @@ -819,7 +819,6 @@ we're running in the final root. When CONTAINER? is true, skip all hardware-related operations as necessary when booting a Linux container." (let* ((services (operating-system-services os #:container? container?)) (boot (fold-services services #:target-type boot-service-type))) - ;; BOOT is the script as a monadic value. (service-value boot))) (define (operating-system-user-accounts os) |