~ruther/guix-local

72507e23b5aeb6b0308d8c4db8d2286095b845ad — Ludovic Courtès 11 years ago 528b6a3
system: Remove useless 'members' field of 'user-group'.

* gnu/system/shadow.scm (<user-group>)[members]: Remove field.
* gnu/system/install.scm (installation-os)[users]: Remove 'members'
  fields.  Use 'supplementary-groups' for 'guest'.
* build-aux/hydra/demo-os.scm (users): Likewise.
* gnu/services/base.scm (guix-service): Remove 'members' field.
4 files changed, 9 insertions(+), 15 deletions(-)

M build-aux/hydra/demo-os.scm
M gnu/services/base.scm
M gnu/system/install.scm
M gnu/system/shadow.scm
M build-aux/hydra/demo-os.scm => build-aux/hydra/demo-os.scm +4 -5
@@ 51,19 51,18 @@

 (users (list (user-account
               (name "guest")
               (group "wheel")
               (group "users")
               (supplementary-groups '("wheel"))  ; allow use of sudo
               (password "")
               (comment "Guest of GNU")
               (home-directory "/home/guest"))))
 (groups (list (user-group (name "root") (id 0))
               (user-group
                (name "wheel")
                (id 1)
                (members '("guest")))             ; allow 'guest' to use sudo
                (id 1))
               (user-group
                (name "users")
                (id 100)
                (members '("guest")))))
                (id 100))))

 (issue "
This is an alpha preview of the GNU system.  Welcome.

M gnu/services/base.scm => gnu/services/base.scm +0 -2
@@ 391,8 391,6 @@ hydra.gnu.org are used by default."
             (user-accounts accounts)
             (user-groups (list (user-group
                                 (name builder-group)
                                 (members (map user-account-name
                                               user-accounts))

                                 ;; Use a fixed GID so that we can create the
                                 ;; store with the right owner.

M gnu/system/install.scm => gnu/system/install.scm +4 -5
@@ 111,19 111,18 @@ Use Alt-F2 for documentation.

    (users (list (user-account
                  (name "guest")
                  (group "wheel")
                  (group "users")
                  (supplementary-groups '("wheel"))  ; allow use of sudo
                  (password "")
                  (comment "Guest of GNU")
                  (home-directory "/home/guest"))))
    (groups (list (user-group (name "root") (id 0))
                  (user-group
                   (name "wheel")
                   (id 1)
                   (members '("guest")))          ; allow 'guest' to use sudo
                   (id 1))
                  (user-group
                   (name "users")
                   (id 100)
                   (members '("guest")))))
                   (id 100))))

    (issue %issue)


M gnu/system/shadow.scm => gnu/system/shadow.scm +1 -3
@@ 40,7 40,6 @@
            user-group-name
            user-group-password
            user-group-id
            user-group-members

            default-skeletons
            skeleton-directory))


@@ 70,8 69,7 @@
  user-group?
  (name           user-group-name)
  (password       user-group-password (default #f))
  (id             user-group-id (default #f))
  (members        user-group-members (default '())))
  (id             user-group-id (default #f)))

(define (default-skeletons)
  "Return the default skeleton files for /etc/skel.  These files are copied by