diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2021-09-20 18:34:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 18:34:39 +0200 |
| commit | 2fcef20cb116a7e46c10cc94db40a6fa6ef3cc1b (patch) | |
| tree | 6bcb12adeadc896af7ebcdfe58ea52aff6ec3593 /nixos | |
| parent | f50fc9e7b219f5d9a26fd5c21bb4c49441ff085d (diff) | |
| parent | f0fac59a17557329024df8a031df6bac1c5f5e9f (diff) | |
| download | nixlib-2fcef20cb116a7e46c10cc94db40a6fa6ef3cc1b.tar nixlib-2fcef20cb116a7e46c10cc94db40a6fa6ef3cc1b.tar.gz nixlib-2fcef20cb116a7e46c10cc94db40a6fa6ef3cc1b.tar.bz2 nixlib-2fcef20cb116a7e46c10cc94db40a6fa6ef3cc1b.tar.lz nixlib-2fcef20cb116a7e46c10cc94db40a6fa6ef3cc1b.tar.xz nixlib-2fcef20cb116a7e46c10cc94db40a6fa6ef3cc1b.tar.zst nixlib-2fcef20cb116a7e46c10cc94db40a6fa6ef3cc1b.zip | |
Merge pull request #138600 from austinbutler/tpm2-tss-group
nixos/tpm2: define group, fix after #133166
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/misc/ids.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/security/tpm2.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/hardware/tcsd.nix | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5f56e0602279..e760a18f5082 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -210,7 +210,7 @@ in #fleet = 173; # unused #input = 174; # unused sddm = 175; - tss = 176; + #tss = 176; # dynamically allocated as of 2021-09-17 #memcached = 177; removed 2018-01-03 #ntp = 179; # dynamically allocated as of 2021-09-17 zabbix = 180; @@ -524,7 +524,7 @@ in #fleet = 173; # unused input = 174; sddm = 175; - tss = 176; + #tss = 176; #dynamically allocateda as of 2021-09-20 #memcached = 177; # unused, removed 2018-01-03 #ntp = 179; # unused zabbix = 180; diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix index 27f9b58c9755..d37425166f88 100644 --- a/nixos/modules/security/tpm2.nix +++ b/nixos/modules/security/tpm2.nix @@ -146,6 +146,7 @@ in { # Create the tss user and group only if the default value is used users.users.${cfg.tssUser} = lib.mkIf (cfg.tssUser == "tss") { isSystemUser = true; + group = "tss"; }; users.groups.${cfg.tssGroup} = lib.mkIf (cfg.tssGroup == "tss") {}; @@ -172,7 +173,7 @@ in { BusName = "com.intel.tss2.Tabrmd"; ExecStart = "${cfg.abrmd.package}/bin/tpm2-abrmd"; User = "tss"; - Group = "nogroup"; + Group = "tss"; }; }; diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index 0d36bce357ba..c549a6775013 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -149,12 +149,10 @@ in users.users = optionalAttrs (cfg.user == "tss") { tss = { group = "tss"; - uid = config.ids.uids.tss; + isSystemUser = true; }; }; - users.groups = optionalAttrs (cfg.group == "tss") { - tss.gid = config.ids.gids.tss; - }; + users.groups = optionalAttrs (cfg.group == "tss") { tss = {}; }; }; } |