pyrox.dev
lol
Fix subuid/subgid generation
I don't think we need to filter users with an unset uid, because
mkSubuidEntry/mkSubgidEntry don't references the uid.
+3
-9
nixos/modules/config/users-groups.nix
+3
-9
nixos/modules/config/users-groups.nix
···
276
};
277
};
278
279
-
filterNull = a: filter (x: hasAttr a x && getAttr a x != null);
280
-
281
-
sortOn "gid" (filterNull "gid" (attrValues cfg.extraGroups))
282
-
sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers))
283
mkSubuidEntry = user: concatStrings (
284
map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n")
285
-
user.subUidRanges);
286
287
-
subuidFile = concatStrings (map mkSubuidEntry (
288
-
sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers))));
289
290
mkSubgidEntry = user: concatStrings (
291
map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n")
292
user.subGidRanges);
293
294
-
subgidFile = concatStrings (map mkSubgidEntry (
295
-
sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers))));
296
297
idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }:
298
let
···
276
};
277
};
278
279
mkSubuidEntry = user: concatStrings (
280
map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n")
281
+
user.subUidRanges);
282
283
+
subuidFile = concatStrings (map mkSubuidEntry (attrValues cfg.extraUsers));
284
285
mkSubgidEntry = user: concatStrings (
286
map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n")
287
user.subGidRanges);
288
289
+
subgidFile = concatStrings (map mkSubgidEntry (attrValues cfg.extraUsers));
290
291
idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }:
292
let