mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-16 13:28:16 +00:00
Code Activity

Merge pull request #1136 from Enzime/push-znntomztlvku

Browse source 
users: don't check home directory is correct before creating user
This commit is contained in:
Emily 2024-11-02 15:15:43 +00:00 • committed by GitHub
commit e56d80b283
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/users/default.nix
View file

@ -158,9 +158,9 @@ in
if ! [[ -n "$u" && "$u" -ne "${toString v.uid}" ]]; then if ! [[ -n "$u" && "$u" -ne "${toString v.uid}" ]]; then
if [ -z "$u" ]; then if [ -z "$u" ]; then
ensurePerms ${name} create ensurePerms ${name} create
fi
${optionalString (v.home != null && v.name != "root") '' ${optionalString (v.home != null && v.name != "root") ''
else
homeDirectory=$(dscl . -read ${dsclUser} NFSHomeDirectory) homeDirectory=$(dscl . -read ${dsclUser} NFSHomeDirectory)
homeDirectory=''${homeDirectory#NFSHomeDirectory: } homeDirectory=''${homeDirectory#NFSHomeDirectory: }
if [[ ${lib.escapeShellArg v.home} != "$homeDirectory" ]]; then if [[ ${lib.escapeShellArg v.home} != "$homeDirectory" ]]; then
@ -176,6 +176,7 @@ in
fi fi
''} ''}
fi fi
fi
'') createdUsers} '') createdUsers}
${concatMapStringsSep "\n" (v: let ${concatMapStringsSep "\n" (v: let