summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Sbuild.hs
diff options
context:
space:
mode:
authorSean Whitton2016-05-19 15:21:23 +0900
committerSean Whitton2016-05-19 15:21:23 +0900
commitde76b8b3f02c5101b7b6efeec6f2d99cf456d4dd (patch)
tree7b364314820ddeab86e41f3a4c355a6b27098de3 /src/Propellor/Property/Sbuild.hs
parent15083c8af59e369b520eb063682804caada32e22 (diff)
Revert "Sbuild.updated cleans a non-shared apt-cache"
With overlay mounts this is irrelevant; there's no reason ever to clean or autoclean.
Diffstat (limited to 'src/Propellor/Property/Sbuild.hs')
-rw-r--r--src/Propellor/Property/Sbuild.hs12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs
index 55fb29c0..3967d0a1 100644
--- a/src/Propellor/Property/Sbuild.hs
+++ b/src/Propellor/Property/Sbuild.hs
@@ -134,16 +134,8 @@ updated s@(SbuildSchroot suite arch) =
`requires` installed
where
go :: Property DebianLike
- go = do
- fstab <- lines <$> liftIO $ readFile "/etc/schroot/sbuild/fstab"
- -- If this schroot shares its apt archives with the host
- -- machine, don't run apt-get clean/autoclean
- let args = if cacheLine `elem` fstab
- then "-udr"
- else "-udcar"
- tightenTargets $ cmdProperty
- "sbuild-update" [args, suite ++ "-" ++ arch]
- cacheLine = "/var/cache/apt/archives /var/cache/apt/archives none rw,bind 0 0"
+ go = tightenTargets $ cmdProperty
+ "sbuild-update" ["-udr", suite ++ "-" ++ arch]
-- Find the conf file that sbuild-createchroot(1) made when we passed it
-- --chroot-suffix=propellor, and edit and rename such that it is as if we