diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/DiskImage/PartSpec.hs | 6 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 2 |
2 files changed, 5 insertions, 3 deletions
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 = |