diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-07-24 20:48:48 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-07-24 20:48:48 -0400 |
| commit | af73f097e430042f3355a93d23cf644d4895de7f (patch) | |
| tree | e24169856c2cfac4f1393c08587ece2cf7b3aa13 /src | |
| parent | 7459552e1bd22f25d110aa5d780bc589daf7067d (diff) | |
| parent | fc51183e97b0022c109e39e64553535f8ef93152 (diff) | |
Merge remote-tracking branch 'spwhitton/robust-rngd'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Sbuild.hs | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 5d58a84a..d128e3b9 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -365,8 +365,23 @@ keypairInsecurelyGenerated = check (not <$> doesFileExist secKeyFile) go go :: Property DebianLike go = combineProperties "sbuild keyring insecurely generated" $ props & Apt.installed ["rng-tools"] - & cmdProperty "rngd" ["-r", "/dev/urandom"] `assume` MadeChange + -- If this dir does not exist the sbuild key generation command + -- will fail; the user might have deleted it to work around + -- #831462 + & File.dirExists "/var/lib/sbuild/apt-keys" + -- If there is already an rngd process running we have to kill + -- it, as it might not be feeding to /dev/urandom + & userScriptProperty (User "root") + [ "kill 2>/dev/null $(cat /var/run/rngd.pid) || true" + , "sleep 10" + , "rngd -r /dev/urandom" + ] + `assume` MadeChange & keypairGenerated + -- Kill off the rngd process we spawned + & userScriptProperty (User "root") + ["kill $(cat /var/run/rngd.pid)"] + `assume` MadeChange -- another script from wiki.d.o/sbuild ccachePrepared :: Property DebianLike |