From e561edc322d275c3687fec431935095cfc717147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si> Date: Tue, 30 Aug 2016 17:13:41 +0200 Subject: [PATCH] update-users-groups.pl: correctly guard duplicate uids for declarative users Verified that following nixos configuration: users.users.foo = { uid = 1000; name = "foo"; }; users.users.bar = { name = "bar"; }; Before this commit both users will get uid of 1000, after it's applied bar will correctly get 1001. --- nixos/modules/config/update-users-groups.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index 967f427374b19..cbbe216e5a17f 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -52,8 +52,8 @@ sub allocUid { $gidsUsed{$g->{gid}} = 1 if defined $g->{gid}; } -foreach my $u (@{$spec->{groups}}) { - $uidsUsed{$u->{u}} = 1 if defined $u->{uid}; +foreach my $u (@{$spec->{users}}) { + $uidsUsed{$u->{uid}} = 1 if defined $u->{uid}; } # Read the current /etc/group.