summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-12-16 11:46:21 -0400
committerJoey Hess2017-12-16 11:46:21 -0400
commitc4a23b61dd3f5d722acbb71d7b721bcd826a897e (patch)
tree4682b7f759064d1742678144d4a1e167ad1e1d1e
parent128ff10e87e548c3af3c5a5916c5dee049826320 (diff)
parent889cbdbb10859c03c0d9c2a784ab01cfbb224dae (diff)
Merge branch 'joeyconfig'
-rw-r--r--joeyconfig.hs2
-rw-r--r--src/Propellor/Property/DiskImage/PartSpec.hs6
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs2
3 files changed, 6 insertions, 4 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 00c22ccc..5a3c7f7f 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -185,7 +185,7 @@ honeybee = host "honeybee.kitenet.net" $ props
& hasPartition
( partition EXT4
`mountedAt` "/"
- `addFreeSpace` MegaBytes 500
+ `setSize` MegaBytes 8000
)
& Apt.installed ["firmware-brcm80211"]
diff --git a/src/Propellor/Property/DiskImage/PartSpec.hs b/src/Propellor/Property/DiskImage/PartSpec.hs
index 6a03c857..942cfa3e 100644
--- a/src/Propellor/Property/DiskImage/PartSpec.hs
+++ b/src/Propellor/Property/DiskImage/PartSpec.hs
@@ -160,8 +160,8 @@ hasPartition p@(mmp, _, _, _) = pureInfoProperty desc
(PartInfo [PartSpecInfo p])
where
desc = case mmp of
- Just mp -> "has " ++ mp ++ " partition"
- Nothing -> "has unmounted partition"
+ Just mp -> mp ++ " partition"
+ Nothing -> "unmounted partition"
-- | Adjusts the PartSpec for the partition mounted at the specified location.
--
@@ -170,7 +170,7 @@ hasPartition p@(mmp, _, _, _) = pureInfoProperty desc
-- > & adjustPartition "/boot" (`addFreeSpace` MegaBytes 150)
adjustPartition :: MountPoint -> (PartSpec PartLocation -> PartSpec PartLocation) -> Property (HasInfo + UnixLike)
adjustPartition mp f = pureInfoProperty
- ("has " ++ mp ++ " adjusted")
+ (mp ++ " adjusted")
(PartInfo [AdjustPartSpecInfo mp f])
-- | Indicates partition layout in a disk. Default is somewhere in the
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 =