diff options
| author | Alex Kost <alezost@gmail.com> | 2015-06-15 13:18:20 +0300 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2015-06-16 21:24:13 +0300 |
| commit | f5a9ffa006687c6759e3d329159dc938b4a705ea (patch) | |
| tree | cd107e55097b4d8eb2be26714b5b908d7a59a908 | |
| parent | 01e64ef50434e663b0f3488dcba0b99bf6ed7a83 (diff) | |
| download | gnu-guix-f5a9ffa006687c6759e3d329159dc938b4a705ea.tar gnu-guix-f5a9ffa006687c6759e3d329159dc938b4a705ea.tar.gz | |
system: Rename 'sudoers' into 'sudoers-file'.
* gnu/system.scm (<operating-system>): Rename record field.
(etc-directory): Rename argument.
(operating-system-etc-directory): Adjust accordingly.
* doc/guix.texi (operating-system Reference): Likewise.
| -rw-r--r-- | doc/guix.texi | 4 | ||||
| -rw-r--r-- | gnu/system.scm | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index f707b5c58f..1c7f4e1232 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4606,8 +4606,8 @@ Linux @dfn{pluggable authentication module} (PAM) services. List of string-valued G-expressions denoting setuid programs. @xref{Setuid Programs}. -@item @code{sudoers} (default: @var{%sudoers-specification}) -@cindex sudoers +@item @code{sudoers-file} (default: @var{%sudoers-specification}) +@cindex sudoers file The contents of the @file{/etc/sudoers} file as a file-like object (@pxref{G-Expressions, @code{local-file} and @code{plain-file}}). diff --git a/gnu/system.scm b/gnu/system.scm index 92ed454b2c..565d6c10c7 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -148,8 +149,8 @@ (setuid-programs operating-system-setuid-programs (default %setuid-programs)) ; list of string-valued gexps - (sudoers operating-system-sudoers ; file-like - (default %sudoers-specification))) + (sudoers-file operating-system-sudoers-file ; file-like + (default %sudoers-specification))) ;;; @@ -440,7 +441,7 @@ on SHELLS. /etc/shells is used by xterm, polkit, and other programs." (pam-services '()) (profile "/run/current-system/profile") hosts-file nss (shells '()) - (sudoers (plain-file "sudoers" ""))) + (sudoers-file (plain-file "sudoers" ""))) "Return a derivation that builds the static part of the /etc directory." (mlet* %store-monad ((pam.d (pam-services->directory pam-services)) @@ -540,7 +541,7 @@ fi\n")) ("hosts" ,#~#$hosts-file) ("localtime" ,#~(string-append #$tzdata "/share/zoneinfo/" #$timezone)) - ("sudoers" ,sudoers))))) + ("sudoers" ,sudoers-file))))) (define (operating-system-profile os) "Return a derivation that builds the system profile of OS." @@ -624,9 +625,9 @@ use 'plain-file' instead~%") #:timezone (operating-system-timezone os) #:hosts-file /etc/hosts #:shells shells - #:sudoers (maybe-string->file - "sudoers" - (operating-system-sudoers os)) + #:sudoers-file (maybe-string->file + "sudoers" + (operating-system-sudoers-file os)) #:profile profile-drv))) (define %setuid-programs |