From 6313fd5582adcec73fbf3186edebf8e31e46dbc5 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 13 Nov 2017 10:50:58 -0700 Subject: conditionalise union-type = overlay --- src/Propellor/Property/Sbuild.hs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property/Sbuild.hs') diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index f96435cf..326d6506 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -142,12 +142,18 @@ built' cc (Props ps) suite arch = provisioned deleted & pair "profile" "sbuild" & pair "type" "directory" & pair "directory" schrootRoot - -- TODO conditionalise (fold into overlayKernels prop?) - & pair "union-type" "overlay" + & unionTypeOverlay & pair "command-prefix" (intercalate "," commandPrefix) where pair k v = ConfFile.containsIniSetting schrootConf (suiteArch ++ "-sbuild", k, v) + unionTypeOverlay :: Property DebianLike + unionTypeOverlay = property' "add union-type = overlay" $ \w -> + Schroot.usesOverlays >>= \usesOverlays -> + if usesOverlays + then ensureProperty w $ + pair "union-type" "overlay" + else noChange compatSymlink = File.isSymlinkedTo ("/etc/sbuild/chroot" suiteArch ++ "-sbuild") -- cgit v1.2.3