diff options
| author | tv <tv@krebsco.de> | 2018-01-02 20:58:59 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-01-02 20:58:59 +0100 |
| commit | 493984d97e6deaee3d7b358724e83c59bccb212d (patch) | |
| tree | 691e019ae0b55d48a9681d9c26ae65e6c83d1d0f /krebs/2configs | |
| parent | 84fdbeba2ceee152a128f5e9013043c172c07ecf (diff) | |
| parent | e48b4eb4606f6d0ec0b930016a53e7e7cfcbfb64 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/2configs')
| -rw-r--r-- | krebs/2configs/buildbot-all.nix | 1 | ||||
| -rw-r--r-- | krebs/2configs/hw/x220.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/krebs/2configs/buildbot-all.nix b/krebs/2configs/buildbot-all.nix index 8a647012f..ca994e996 100644 --- a/krebs/2configs/buildbot-all.nix +++ b/krebs/2configs/buildbot-all.nix @@ -9,5 +9,6 @@ with import <stockholm/lib>; krebs.ci.enable = true; krebs.ci.treeStableTimer = 1; krebs.ci.hosts = filter (getAttr "ci") (attrValues config.krebs.hosts); + krebs.ci.tests = [ "deploy" ]; } diff --git a/krebs/2configs/hw/x220.nix b/krebs/2configs/hw/x220.nix index 44743b87d..90a1a111f 100644 --- a/krebs/2configs/hw/x220.nix +++ b/krebs/2configs/hw/x220.nix @@ -23,7 +23,7 @@ with import <stockholm/lib>; pkgs.vaapiVdpau ]; - security.rngd.enable = true; + security.rngd.enable = mkDefault true; services.xserver = { videoDriver = "intel"; |