diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-07-24 09:40:51 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-07-24 09:40:51 -0700 |
| commit | 2685903b8202b1a5686c9d62d8dedc988c4b22b7 (patch) | |
| tree | 44c1ba0eb0ed1f16571d1f59cb876311e7c59504 /src | |
| parent | 3b609c08d2dcb1e02938359c10ca46f82a4b472e (diff) | |
process management in keypairInsecurelyGenerated
This makes Sbuild.keypairInsecurelyGenerated more robust, by handling
several conditions that could cause it to fail.
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..1f42434d 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 $(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 |