summary refs log tree commit diff
diff options
context:
space:
mode:
authorScott R. Parish <srparish@gmail.com>2016-09-16 14:27:19 -0700
committerScott R. Parish <srparish@gmail.com>2016-09-17 18:36:57 -0700
commita560223119a7d434ad09b26246bd485f893036e1 (patch)
tree8cebd1f1d994550998209c54cb9ff79c896ac667
parentedcaebf1d9e7b7440985a34e5273b82bce5eb938 (diff)
downloadnixpkgs-a560223119a7d434ad09b26246bd485f893036e1.tar
nixpkgs-a560223119a7d434ad09b26246bd485f893036e1.tar.gz
nixpkgs-a560223119a7d434ad09b26246bd485f893036e1.tar.bz2
nixpkgs-a560223119a7d434ad09b26246bd485f893036e1.tar.lz
nixpkgs-a560223119a7d434ad09b26246bd485f893036e1.tar.xz
nixpkgs-a560223119a7d434ad09b26246bd485f893036e1.tar.zst
nixpkgs-a560223119a7d434ad09b26246bd485f893036e1.zip
rngd: update modalias to match cpu type
It looks like the cpu type part of modalias might have changed, my
systems (4.4.20 and 4.7.2) show something like the following:

```
cpu:type:x86,ven0000fam0006mod003F:feature:,0000,0001,0002,0003,0004,0005,0006,0007,0008,0009,000B,000C,000D,000E,000F,0010,0011,0013,0017,0018,0019,001A,001C,002B,0034,003B,003D,0068,006F,0070,0072,0074,0075,0076,007D,0080,0081,0089,008C,008D,0091,0093,0094,0095,0096,0097,0098,0099,009A,009B,009C,009D,009E,009F,00C0,00C5,0120,0123,0125,0127,0128,0129,012A,0140
```

Update the rngd modalias rule to match this so udev properly has
systemd start rngd.
-rw-r--r--nixos/modules/security/rngd.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
index b14ea7a5f27..3a1ffc55e5f 100644
--- a/nixos/modules/security/rngd.nix
+++ b/nixos/modules/security/rngd.nix
@@ -18,7 +18,7 @@ with lib;
   config = mkIf config.security.rngd.enable {
     services.udev.extraRules = ''
       KERNEL=="random", TAG+="systemd"
-      SUBSYSTEM=="cpu", ENV{MODALIAS}=="x86cpu:*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
+      SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
       KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
       ${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''}
     '';