nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Alex Kost 2015-06-15 13:18:20 +03:00
parent 01e64ef504
commit f5a9ffa006
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guix.texi
View File

@ -4606,8 +4606,8 @@ Linux @dfn{pluggable authentication module} (PAM) services.
List of string-valued G-expressions denoting setuid programs. List of string-valued G-expressions denoting setuid programs.
@xref{Setuid Programs}. @xref{Setuid Programs}.
@item @code{sudoers} (default: @var{%sudoers-specification}) @item @code{sudoers-file} (default: @var{%sudoers-specification})
@cindex sudoers @cindex sudoers file
The contents of the @file{/etc/sudoers} file as a file-like object The contents of the @file{/etc/sudoers} file as a file-like object
(@pxref{G-Expressions, @code{local-file} and @code{plain-file}}). (@pxref{G-Expressions, @code{local-file} and @code{plain-file}}).

11
gnu/system.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -148,7 +149,7 @@
(setuid-programs operating-system-setuid-programs (setuid-programs operating-system-setuid-programs
(default %setuid-programs)) ; list of string-valued gexps (default %setuid-programs)) ; list of string-valued gexps
(sudoers operating-system-sudoers ; file-like (sudoers-file operating-system-sudoers-file ; file-like
(default %sudoers-specification))) (default %sudoers-specification)))
@ -440,7 +441,7 @@ on SHELLS. /etc/shells is used by xterm, polkit, and other programs."
(pam-services '()) (pam-services '())
(profile "/run/current-system/profile") (profile "/run/current-system/profile")
hosts-file nss (shells '()) 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." "Return a derivation that builds the static part of the /etc directory."
(mlet* %store-monad (mlet* %store-monad
((pam.d (pam-services->directory pam-services)) ((pam.d (pam-services->directory pam-services))
@ -540,7 +541,7 @@ fi\n"))
("hosts" ,#~#$hosts-file) ("hosts" ,#~#$hosts-file)
("localtime" ,#~(string-append #$tzdata "/share/zoneinfo/" ("localtime" ,#~(string-append #$tzdata "/share/zoneinfo/"
#$timezone)) #$timezone))
("sudoers" ,sudoers))))) ("sudoers" ,sudoers-file)))))
(define (operating-system-profile os) (define (operating-system-profile os)
"Return a derivation that builds the system profile of OS." "Return a derivation that builds the system profile of OS."
@ -624,9 +625,9 @@ use 'plain-file' instead~%")
#:timezone (operating-system-timezone os) #:timezone (operating-system-timezone os)
#:hosts-file /etc/hosts #:hosts-file /etc/hosts
#:shells shells #:shells shells
#:sudoers (maybe-string->file #:sudoers-file (maybe-string->file
"sudoers" "sudoers"
(operating-system-sudoers os)) (operating-system-sudoers-file os))
#:profile profile-drv))) #:profile profile-drv)))
(define %setuid-programs (define %setuid-programs