Merge pull request #70465 from worldofpeace/pam-home
nixos/system-environment: use pam syntax for home variable
This commit is contained in:
commit
60ddfac0c6
nixos/modules/config
|
@ -78,9 +78,7 @@ in
|
||||||
# We're trying to use the same syntax for PAM variables and env variables.
|
# We're trying to use the same syntax for PAM variables and env variables.
|
||||||
# That means we need to map the env variables that people might use to their
|
# That means we need to map the env variables that people might use to their
|
||||||
# equivalent PAM variable.
|
# equivalent PAM variable.
|
||||||
# Note: PAM_USER is a PAM_ITEM, HOME is an environment variable, they have
|
replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"];
|
||||||
# different syntax.
|
|
||||||
replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["\${HOME}" "@{PAM_USER}"];
|
|
||||||
|
|
||||||
pamVariable = n: v:
|
pamVariable = n: v:
|
||||||
''${n} DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"'';
|
''${n} DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"'';
|
||||||
|
|
Loading…
Reference in New Issue