Unverified Commit 24167c94 authored by Janne Heß's avatar Janne Heß Committed by GitHub
Browse files

Merge pull request #196337 from SuperSandro2000/update-users-groups 

nixos/update-users-groups.pl: sort json file for better reproducibility
parents 406e1954 62cace13

nixos/modules/config/update-users-groups.pl

+2 −2
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ foreach my $name (keys %groupsCur) { 
# Rewrite /etc/group. FIXME: acquire lock.

my @lines = map { join(":", $_->{name}, $_->{password}, $_->{gid}, $_->{members}) . "\n" }

    (sort { $a->{gid} <=> $b->{gid} } values(%groupsOut));

updateFile($gidMapFile, to_json($gidMap));

updateFile($gidMapFile, to_json($gidMap, {canonical => 1}));

updateFile("/etc/group", \@lines);

nscdInvalidate("group");
@@ -272,7 +272,7 @@ foreach my $name (keys %usersCur) { 
# Rewrite /etc/passwd. FIXME: acquire lock.

@lines = map { join(":", $_->{name}, $_->{fakePassword}, $_->{uid}, $_->{gid}, $_->{description}, $_->{home}, $_->{shell}) . "\n" }

    (sort { $a->{uid} <=> $b->{uid} } (values %usersOut));

updateFile($uidMapFile, to_json($uidMap));

updateFile($uidMapFile, to_json($uidMap, {canonical => 1}));

updateFile("/etc/passwd", \@lines);

nscdInvalidate("passwd");