diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-03-23 22:50:07 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-23 22:50:07 +0100 |
commit | 3cb61ca85a634db2dcc2badaf3492440bf621d92 (patch) | |
tree | 72561a5f7056aa29cec7d50fb8b960b32b44a585 /gnu/system.scm | |
parent | a60370727a77d1658307698276239c153d8279e8 (diff) | |
parent | f92854fea150f0d47c4984f87bf21bd5f8051820 (diff) | |
download | guix-3cb61ca85a634db2dcc2badaf3492440bf621d92.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system.scm')
-rw-r--r-- | gnu/system.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index e6c86cb9ba..6bccdaa8c2 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -181,7 +181,7 @@ (groups operating-system-groups ; list of user groups (default %base-groups)) - (skeletons operating-system-skeletons ; list of name/monadic value + (skeletons operating-system-skeletons ; list of name/file-like value (default (default-skeletons))) (issue operating-system-issue ; string (default %default-issue)) @@ -199,7 +199,7 @@ (name-service-switch operating-system-name-service-switch ; <name-service-switch> (default %default-nss)) - (services operating-system-user-services ; list of monadic services + (services operating-system-user-services ; list of services (default %base-services)) (pam-services operating-system-pam-services ; list of PAM services |