diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-03-11 16:52:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-03-11 16:52:00 -0400 |
| commit | 9a54ba471986b994f10ad332f27639059c18e7e1 (patch) | |
| tree | f940327c4f66f6e38420a402cd36a7b1ad6bc260 /src/Propellor/Property/FreeBSD | |
| parent | 8a7efe723e4de97065424d1e2396fe0ce5144f56 (diff) | |
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.
Diffstat (limited to 'src/Propellor/Property/FreeBSD')
| -rw-r--r-- | src/Propellor/Property/FreeBSD/Pkg.hs | 5 | ||||
| -rw-r--r-- | src/Propellor/Property/FreeBSD/Poudriere.hs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Propellor/Property/FreeBSD/Pkg.hs b/src/Propellor/Property/FreeBSD/Pkg.hs index 704c1db9..77bf5768 100644 --- a/src/Propellor/Property/FreeBSD/Pkg.hs +++ b/src/Propellor/Property/FreeBSD/Pkg.hs @@ -39,7 +39,7 @@ pkgCmd cmd args = newtype PkgUpdate = PkgUpdate String deriving (Typeable, Monoid, Show) instance IsInfo PkgUpdate where - propagateInfo _ = False + propagateInfo _ = PropagateInfo False pkgUpdated :: PkgUpdate -> Bool pkgUpdated (PkgUpdate _) = True @@ -55,8 +55,9 @@ update = newtype PkgUpgrade = PkgUpgrade String deriving (Typeable, Monoid, Show) + instance IsInfo PkgUpgrade where - propagateInfo _ = False + propagateInfo _ = PropagateInfo False pkgUpgraded :: PkgUpgrade -> Bool pkgUpgraded (PkgUpgrade _) = True diff --git a/src/Propellor/Property/FreeBSD/Poudriere.hs b/src/Propellor/Property/FreeBSD/Poudriere.hs index e6ddea16..378c5530 100644 --- a/src/Propellor/Property/FreeBSD/Poudriere.hs +++ b/src/Propellor/Property/FreeBSD/Poudriere.hs @@ -21,7 +21,7 @@ newtype PoudriereConfigured = PoudriereConfigured String deriving (Typeable, Monoid, Show) instance IsInfo PoudriereConfigured where - propagateInfo _ = False + propagateInfo _ = PropagateInfo False poudriereConfigured :: PoudriereConfigured -> Bool poudriereConfigured (PoudriereConfigured _) = True |