Author: eelco
Date: Sun Apr 22 16:28:08 2012
New Revision: 33877
URL: https://nixos.org/websvn/nix/?rev=33877&sc=1
Log:
* Slight simplification.
Modified:
nixos/trunk/modules/config/users-groups.nix
Modified: nixos/trunk/modules/config/users-groups.nix
==============================================================================
--- nixos/trunk/modules/config/users-groups.nix Sun Apr 22 10:44:53 2012
(r33876)
+++ nixos/trunk/modules/config/users-groups.nix Sun Apr 22 16:28:08 2012
(r33877)
@@ -124,8 +124,6 @@
# having an empty password, and not having a password.
serializedUser = userName: let u = getAttr userName config.users.extraUsers;
in "${u.name}\n${u.description}\n${if u.uid != null then toString u.uid else
""}\n${u.group}\n${toString (concatStringsSep ","
u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n${if
u.password != null then "X" + u.password else ""}\n${toString
u.isSystemUser}\n${if u.createUser then "yes" else "no"}\n";
- serializedGroup = g: "${g.name}\n${toString g.gid}";
-
# keep this extra file so that cat can be used to pass special chars such as
"`" which is used in the avahi daemon
usersFile = pkgs.writeText "users" (
concatMapStrings serializedUser (attrNames config.users.extraUsers)
@@ -290,9 +288,9 @@
''
echo "updating groups..."
- while true; do
- read name || break
- read gid
+ createGroup() {
+ name="$1"
+ gid="$2"
if ! curEnt=$(getent group "$name"); then
groupadd --system \
@@ -306,9 +304,11 @@
groupmod --gid $gid "$name"
fi
fi
- done <<EndOfGroupList
- ${concatStringsSep "\n" (map serializedGroup (attrValues
config.users.extraGroups))}
- EndOfGroupList
+ }
+
+ ${flip concatMapStrings (attrValues config.users.extraGroups) (g: ''
+ createGroup '${g.name}' '${toString g.gid}'
+ '')}
'';
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
