diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-12-09 22:29:01 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-12-10 00:24:02 +0100 |
| commit | 78ed003811a38a7a3de56316755a2808b7d87e45 (patch) | |
| tree | 82be5857976aef71f3a72c345e4768b93b094089 /gnu/system/dmd.scm | |
| parent | 13ce0e3aa7c4803f35063cd1adcfa1279cc80dd5 (diff) | |
gnu: Add 'inputs' field to <user-account>; make 'shell' a monadic value.
* gnu/system/shadow.scm (<user-account>)[inputs]: New field.
(passwd-file): Bind the 'shell' field of each account.
* gnu/system/vm.scm (%demo-operating-system): Remove 'shell' field.
* gnu/system/dmd.scm (guix-build-accounts): Store a monadic value in
'shell'. Add 'inputs' field.
* gnu/system.scm (operating-system-derivation): Remove 'shell' field for
'root' account. Add all the 'user-account-inputs' to EXTRAS.
Diffstat (limited to 'gnu/system/dmd.scm')
| -rw-r--r-- | gnu/system/dmd.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/system/dmd.scm b/gnu/system/dmd.scm index 307412a5d5..7cd5f05f78 100644 --- a/gnu/system/dmd.scm +++ b/gnu/system/dmd.scm @@ -181,18 +181,18 @@ (shadow shadow)) "Return a list of COUNT user accounts for Guix build users, with UIDs starting at FIRST-UID, and under GID." - (mlet* %store-monad ((gid* -> gid) - (no-login (package-file shadow "sbin/nologin"))) + (with-monad %store-monad (return (unfold (cut > <> count) (lambda (n) (user-account (name (format #f "guixbuilder~2,'0d" n)) (password "!") (uid (+ first-uid n -1)) - (gid gid*) + (gid gid) (comment (format #f "Guix Build User ~2d" n)) (home-directory "/var/empty") - (shell no-login))) + (shell (package-file shadow "sbin/nologin")) + (inputs `(("shadow" ,shadow))))) 1+ 1)))) |