public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix subuid/subgid generation

Browse Source 
I don't think we need to filter users with an unset uid, because
mkSubuidEntry/mkSubgidEntry don't references the uid.
This commit is contained in:
Eelco Dolstra 2014-09-05 17:40:09 +02:00
parent c4a35d8cf9
commit 20be024d1b
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/config/users-groups.nix
View File

@ -276,23 +276,17 @@ let
}; };
}; };
filterNull = a: filter (x: hasAttr a x && getAttr a x != null);
sortOn "gid" (filterNull "gid" (attrValues cfg.extraGroups))
sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers))
mkSubuidEntry = user: concatStrings ( mkSubuidEntry = user: concatStrings (
map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n") map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n")
user.subUidRanges); user.subUidRanges);
subuidFile = concatStrings (map mkSubuidEntry ( subuidFile = concatStrings (map mkSubuidEntry (attrValues cfg.extraUsers));
sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers))));
mkSubgidEntry = user: concatStrings ( mkSubgidEntry = user: concatStrings (
map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n") map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n")
user.subGidRanges); user.subGidRanges);
subgidFile = concatStrings (map mkSubgidEntry ( subgidFile = concatStrings (map mkSubgidEntry (attrValues cfg.extraUsers));
sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers))));
idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }: idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }:
let let