diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-05-21 11:32:36 +0900 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-05-21 11:32:36 +0900 |
| commit | 76cc003f421a30f2d380a4f619812466cfa1dc8a (patch) | |
| tree | 578835a780ea1675600d5bbaa9f006af05405b40 /src | |
| parent | 9c2a1ac8efed3ec3b8ef7b9aa776f6d72a7c3330 (diff) | |
fix ccache mount and line length
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Sbuild.hs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 3168ffed..202108a4 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -87,16 +87,16 @@ instance Show SbuildSchroot where -- This function is a convenience wrapper around 'Sbuild.builtFor', allowing the -- user to identify the schroot and distribution using the 'System' type builtFor :: System -> RevertableProperty DebianLike UnixLike -builtFor system = go <!> deleted +builtFor sys = go <!> deleted where - go = property' ("sbuild schroot for " ++ show system) $ - \w -> case (schrootFromSystem system, stdMirror system) of + go = property' ("sbuild schroot for " ++ show sys) $ + \w -> case (schrootFromSystem sys, stdMirror sys) of (Just s, Just u) -> ensureProperty w $ setupRevertableProperty $ built s u _ -> errorMessage - ("don't know how to debootstrap " ++ show system) - deleted = property' ("no sbuild schroot for " ++ show system) $ - \w -> case schrootFromSystem system of + ("don't know how to debootstrap " ++ show sys) + deleted = property' ("no sbuild schroot for " ++ show sys) $ + \w -> case schrootFromSystem sys of Just s -> ensureProperty w $ undoRevertableProperty $ built s "dummy" Nothing -> noChange @@ -237,7 +237,7 @@ ccachePrepared :: Property DebianLike ccachePrepared = propertyList "sbuild group ccache configured" $ props & Group "sbuild" `Ccache.hasGroupCache` "2G" & "/etc/schroot/sbuild/fstab" `File.containsLine` - "/var/cache/ccache-sbuild /var/cache/ccache-sbuild rw,bind 0 0" + "/var/cache/ccache-sbuild /var/cache/ccache-sbuild none rw,bind 0 0" & "/var/cache/ccache-sbuild/sbuild-setup" `File.hasContent` [ "#!/bin/sh" , "" |