summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Cron.hs
diff options
context:
space:
mode:
authorJoey Hess2015-04-02 10:20:44 -0400
committerJoey Hess2015-04-02 10:20:44 -0400
commit86783dc52d048418439019067a0a1afccd4829d1 (patch)
tree392e55d1b1abecf0dab5e4b0ecec3a9359d0f6e0 /src/Propellor/Property/Cron.hs
parent015b249c6672527dce31a61610358ccbb46f3b46 (diff)
Make propellor resistent to changes to shared libraries, such as libffi
* Make propellor resistent to changes to shared libraries, such as libffi, which might render the propellor binary unable to run. This is dealt with by checking the binary both when running propellor on a remote host, and by Cron.runPropellor. If the binary doesn't work, it will be rebuilt. * Note that since a new switch had to be added to allow testing the binary, upgrading to this version will cause a rebuild from scratch of propellor.
Diffstat (limited to 'src/Propellor/Property/Cron.hs')
-rw-r--r--src/Propellor/Property/Cron.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Propellor/Property/Cron.hs b/src/Propellor/Property/Cron.hs
index 2a28a157..222f3849 100644
--- a/src/Propellor/Property/Cron.hs
+++ b/src/Propellor/Property/Cron.hs
@@ -3,6 +3,7 @@ module Propellor.Property.Cron where
import Propellor
import qualified Propellor.Property.File as File
import qualified Propellor.Property.Apt as Apt
+import Propellor.Bootstrap
import Utility.SafeCommand
import Utility.FileMode
@@ -81,4 +82,5 @@ 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 "root" localdir "./propellor"
+runPropellor times = niceJob "propellor" times "root" localdir
+ (bootstrapPropellorCommand ++ "; ./propellor")