diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-07 17:05:25 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-07 17:05:25 -0400 |
| commit | 4a7b19ea49923de05aca639816d27dc184cdb25a (patch) | |
| tree | 6da836d12928daa43689e8e07f9e500b15c7fae0 /src/Propellor/Property | |
| parent | a654b64ac5d466039494673c5e829c94a3902ce2 (diff) | |
make Cron.runPropellor pass System to bootstrapPropellorCommand
Rather than having the property fail when the Host has no OS defined,
I made bootstrapPropellorCommand not install deps in this situation.
The cron job will (probably) still work, unless a system upgrade causes
deps to be removed.
Diffstat (limited to 'src/Propellor/Property')
| -rw-r--r-- | src/Propellor/Property/Cron.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Propellor/Property/Cron.hs b/src/Propellor/Property/Cron.hs index a6ab3eca..365e2903 100644 --- a/src/Propellor/Property/Cron.hs +++ b/src/Propellor/Property/Cron.hs @@ -81,5 +81,7 @@ niceJob desc times user cddir command = job desc times user cddir -- | Installs a cron job to run propellor. runPropellor :: Times -> Property NoInfo -runPropellor times = niceJob "propellor" times (User "root") localdir "true" --- (bootstrapPropellorCommand ++ "; ./propellor") +runPropellor times = withOS "propellor cron job" $ \o -> + ensureProperty $ + niceJob "propellor" times (User "root") localdir + (bootstrapPropellorCommand o ++ "; ./propellor") |