diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-12-16 11:46:21 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-12-16 11:46:21 -0400 |
| commit | c4a23b61dd3f5d722acbb71d7b721bcd826a897e (patch) | |
| tree | 4682b7f759064d1742678144d4a1e167ad1e1d1e /src/Propellor/Property/SiteSpecific | |
| parent | 128ff10e87e548c3af3c5a5916c5dee049826320 (diff) | |
| parent | 889cbdbb10859c03c0d9c2a784ab01cfbb224dae (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/SiteSpecific')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 2d5a244f..e3d21ac1 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -181,6 +181,8 @@ armAutoBuilder suite arch flavor = -- Works around ghc crash with parallel builds on arm. & (homedir </> ".cabal" </> "config") `File.lacksLine` "jobs: $ncpus" + -- Work around https://github.com/systemd/systemd/issues/7135 + & Systemd.containerCfg "--system-call-filter=set_tls" androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container androidAutoBuilderContainer crontimes timeout = |