summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-06-22 21:48:35 +0200
committerLudovic Courtès <ludo@gnu.org>2014-06-22 21:48:35 +0200
commit72507e23b5aeb6b0308d8c4db8d2286095b845ad (patch)
treec36970407a09e4c4acc8d88caf1e69d0967af53a
parent528b6a3dcea1edab7a8d1ce62a616a0ff6c8c597 (diff)
downloadpatches-72507e23b5aeb6b0308d8c4db8d2286095b845ad.tar
patches-72507e23b5aeb6b0308d8c4db8d2286095b845ad.tar.gz
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.
-rw-r--r--build-aux/hydra/demo-os.scm9
-rw-r--r--gnu/services/base.scm2
-rw-r--r--gnu/system/install.scm9
-rw-r--r--gnu/system/shadow.scm4
4 files changed, 9 insertions, 15 deletions
diff --git a/build-aux/hydra/demo-os.scm b/build-aux/hydra/demo-os.scm
index bb8cd05fc2..835b381ffa 100644
--- a/build-aux/hydra/demo-os.scm
+++ b/build-aux/hydra/demo-os.scm
@@ -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.
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 65a8ceefc4..595cac254b 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -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.
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 06f8a3f058..ed6581f706 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -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)
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index 738816b78f..471390da61 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -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