ehmry
/
nix-processmgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only take uid or gid from the ids map, if none was specified

This commit is contained in:
Sander van der Burg 2021-03-07 18:04:20 +01:00 committed by Sander van der Burg
parent 5f65ae4e96
commit ebf962a81d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixproc/create-credentials/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
group = builtins.getAttr groupname groups;
in
''
${lib.optionalString (ids ? gids && builtins.hasAttr groupname ids.gids) ''echo "gid=${toString ids.gids."${groupname}"}" > $out/dysnomia-support/groups/${groupname}''}
${lib.optionalString (!(group ? gid) && ids ? gids && builtins.hasAttr groupname ids.gids) ''echo "gid=${toString ids.gids."${groupname}"}" > $out/dysnomia-support/groups/${groupname}''}
cat >> $out/dysnomia-support/groups/${groupname} <<EOF
${lib.concatMapStrings (propertyName:
@ -42,7 +42,7 @@ stdenv.mkDerivation {
''
# Regular user creation configuration
else ''
${lib.optionalString (ids ? uids && builtins.hasAttr username ids.uids) ''echo "uid=${toString ids.uids."${username}"}" > $out/dysnomia-support/users/${username}''}
${lib.optionalString (!(user ? uid) && ids ? uids && builtins.hasAttr username ids.uids) ''echo "uid=${toString ids.uids."${username}"}" > $out/dysnomia-support/users/${username}''}
cat >> $out/dysnomia-support/users/${username} <<EOF
${lib.concatMapStrings (propertyName: