all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Alex Kost <alezost@gmail.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: Re: 'sudoers' vs. 'hosts-file'
Date: Mon, 15 Jun 2015 15:18:06 +0300	[thread overview]
Message-ID: <87fv5tf9mp.fsf@gmail.com> (raw)
In-Reply-To: <87616q6jxl.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Sun, 14 Jun 2015 23:48:06 +0200")

[-- Attachment #1: Type: text/plain, Size: 690 bytes --]

Ludovic Courtès (2015-06-15 00:48 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> Since there is no real difference between 'sudoers' and 'hosts-file'
>> fields (of operating-system declaration), what about renaming one of
>> them?
>
> Makes sense.
>
>> So it could be either:
>>
>>   'sudoers-file' and 'hosts-file'
>>
>> or
>>
>>   'sudoers' and 'hosts'
>>
>> (I prefer the latter variant)
>
> I prefer the former because the value is really a file, and not, say, a
> list of user names or a list of host names.
>
> WDYT?

Indeed, thanks for the explanation.  I agree with you.

> Would you like to send a patch?

Yes, the patch is attached.


[-- Attachment #2: 0001-system-Rename-sudoers-into-sudoers-file.patch --]
[-- Type: text/x-patch, Size: 3555 bytes --]

From 3b221f12e6f5be01166772f5b23b648903342954 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Mon, 15 Jun 2015 13:18:20 +0300
Subject: [PATCH] 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.
---
 doc/guix.texi  |  4 ++--
 gnu/system.scm | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 46dccb8..e356272 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 92ed454..565d6c1 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)))
 
 \f
 ;;;
@@ -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
-- 
2.2.1


  reply	other threads:[~2015-06-15 12:18 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-14 12:47 'sudoers' vs. 'hosts-file' Alex Kost
2015-06-14 21:48 ` Ludovic Courtès
2015-06-15 12:18   ` Alex Kost [this message]
2015-06-15 20:10     ` Ludovic Courtès
2015-06-14 22:52 ` Daniel Pimentel
2015-06-15 12:17   ` Alex Kost
2015-06-15 15:21     ` Daniel Pimentel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87fv5tf9mp.fsf@gmail.com \
    --to=alezost@gmail.com \
    --cc=guix-devel@gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.