ab6a279abb
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
77 lines
2.6 KiB
Scheme
77 lines
2.6 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
|
;;;
|
|
;;; This file is part of GNU Guix.
|
|
;;;
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
;;; under the terms of the GNU General Public License as published by
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
;;; your option) any later version.
|
|
;;;
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;;; GNU General Public License for more details.
|
|
;;;
|
|
;;; You should have received a copy of the GNU General Public License
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
(define-module (gnu system shadow)
|
|
#:use-module (guix store)
|
|
#:use-module (guix records)
|
|
#:use-module (guix packages)
|
|
#:use-module (guix gexp)
|
|
#:use-module (guix monads)
|
|
#:use-module ((gnu packages admin)
|
|
#:select (shadow))
|
|
#:use-module (gnu packages bash)
|
|
#:use-module (srfi srfi-1)
|
|
#:use-module (ice-9 match)
|
|
#:export (user-account
|
|
user-account?
|
|
user-account-name
|
|
user-account-password
|
|
user-account-uid
|
|
user-account-group
|
|
user-account-supplementary-groups
|
|
user-account-comment
|
|
user-account-home-directory
|
|
user-account-shell
|
|
|
|
user-group
|
|
user-group?
|
|
user-group-name
|
|
user-group-password
|
|
user-group-id
|
|
user-group-members))
|
|
|
|
;;; Commentary:
|
|
;;;
|
|
;;; Utilities for configuring the Shadow tool suite ('login', 'passwd', etc.)
|
|
;;;
|
|
;;; Code:
|
|
|
|
(define-record-type* <user-account>
|
|
user-account make-user-account
|
|
user-account?
|
|
(name user-account-name)
|
|
(password user-account-password (default #f))
|
|
(uid user-account-uid (default #f))
|
|
(group user-account-group) ; number | string
|
|
(supplementary-groups user-account-supplementary-groups
|
|
(default '())) ; list of strings
|
|
(comment user-account-comment (default ""))
|
|
(home-directory user-account-home-directory)
|
|
(shell user-account-shell ; gexp
|
|
(default #~(string-append #$bash "/bin/bash"))))
|
|
|
|
(define-record-type* <user-group>
|
|
user-group make-user-group
|
|
user-group?
|
|
(name user-group-name)
|
|
(password user-group-password (default #f))
|
|
(id user-group-id (default #f))
|
|
(members user-group-members (default '())))
|
|
|
|
;;; shadow.scm ends here
|