From 9a54ba471986b994f10ad332f27639059c18e7e1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Mar 2017 16:52:00 -0400 Subject: don't propagate DNS info from DiskImage chroots * DiskImage building properties used to propagate DNS info out from the chroot used to build the disk image to the Host. That is no longer done, since that chroot only exists as a side effect of the disk image creation and servers will not be running in it. * The IsInfo types class's propagateInfo function changed to use a PropagateInfo data type. (API change) This is particularly important when using hostChroot, since the host could well have DNS settings then. This commit was sponsored by Ole-Morten Duesund on Patreon. --- src/Propellor/Property/Conductor.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Propellor/Property/Conductor.hs') diff --git a/src/Propellor/Property/Conductor.hs b/src/Propellor/Property/Conductor.hs index 8aa18d20..cfeb5aa7 100644 --- a/src/Propellor/Property/Conductor.hs +++ b/src/Propellor/Property/Conductor.hs @@ -323,15 +323,15 @@ instance Show NotConductorFor where show (NotConductorFor l) = "NotConductorFor " ++ show (map hostName l) instance IsInfo ConductorFor where - propagateInfo _ = False + propagateInfo _ = PropagateInfo False instance IsInfo NotConductorFor where - propagateInfo _ = False + propagateInfo _ = PropagateInfo False -- Added to Info when a host has been orchestrated. newtype Orchestrated = Orchestrated Any deriving (Typeable, Monoid, Show) instance IsInfo Orchestrated where - propagateInfo _ = False + propagateInfo _ = PropagateInfo False isOrchestrated :: Orchestrated -> Bool isOrchestrated (Orchestrated v) = getAny v -- cgit v1.2.3