summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Propellor/Property/Obnam.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Propellor/Property/Obnam.hs b/Propellor/Property/Obnam.hs
index 00e0bbef..1e861588 100644
--- a/Propellor/Property/Obnam.hs
+++ b/Propellor/Property/Obnam.hs
@@ -46,7 +46,7 @@ backup dir crontimes params numclients = cronjob `describe` desc
where
desc = dir ++ " backed up by obnam"
cronjob = Cron.niceJob ("obnam_backup" ++ dir) crontimes "root" "/" $
- intercalate ";" $ catMaybes
+ intercalate ";" $ map flockcmd $ catMaybes
[ if numclients == OnlyClient
then Just $ unwords $
[ "obnam"
@@ -59,6 +59,7 @@ backup dir crontimes params numclients = cronjob `describe` desc
, shellEscape dir
] ++ map shellEscape params
]
+ flockcmd cmd = "flock -n " ++ shellEscape dir ++ " " ++ cmd
-- | Restores a directory from an obnam backup.
--