diff options
| author | Leo Famulari <leo@famulari.name> | 2017-07-23 03:42:12 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-07-23 03:42:12 -0400 |
| commit | 6c1a317e29c45e85e3a0e050612cdefe470b100c (patch) | |
| tree | e65dedf933090b1a9f8398655b3b20eba49fae96 /gnu/system.scm | |
| parent | b7158b767b7fd9f0379dfe08083c48a0cf0f3d50 (diff) | |
| parent | 9478c05955643f8ff95dabccc1e42b20abb88049 (diff) | |
| download | gnu-guix-6c1a317e29c45e85e3a0e050612cdefe470b100c.tar gnu-guix-6c1a317e29c45e85e3a0e050612cdefe470b100c.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index e813bfc20c..d8f0f0275c 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -403,17 +403,18 @@ OS." (define* (operating-system-directory-base-entries os #:key container?) "Return the basic entries of the 'system' directory of OS for use as the value of the SYSTEM-SERVICE-TYPE service." - (mlet %store-monad ((locale (operating-system-locale-directory os))) - (if container? - (return `(("locale" ,locale))) - (mlet %store-monad - ((kernel -> (operating-system-kernel os)) - (initrd (operating-system-initrd-file os)) - (params (operating-system-boot-parameters-file os))) - (return `(("kernel" ,kernel) - ("parameters" ,params) - ("initrd" ,initrd) - ("locale" ,locale))))))) ;used by libc + (let ((locale (operating-system-locale-directory os))) + (with-monad %store-monad + (if container? + (return `(("locale" ,locale))) + (mlet %store-monad + ((kernel -> (operating-system-kernel os)) + (initrd (operating-system-initrd-file os)) + (params (operating-system-boot-parameters-file os))) + (return `(("kernel" ,kernel) + ("parameters" ,params) + ("initrd" ,initrd) + ("locale" ,locale)))))))) ;used by libc (define* (essential-services os #:key container?) "Return the list of essential services for OS. These are special services @@ -723,6 +724,8 @@ use 'plain-file' instead~%") (let ((shadow (@ (gnu packages admin) shadow))) (list (file-append shadow "/bin/passwd") (file-append shadow "/bin/su") + (file-append shadow "/bin/newuidmap") + (file-append shadow "/bin/newgidmap") (file-append inetutils "/bin/ping") (file-append inetutils "/bin/ping6") (file-append sudo "/bin/sudo") |