From 6cdd37d9ff3ff3e3b8439445c1363b9bdc77a5da Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 21 Nov 2014 20:53:38 -0400 Subject: propellor spin --- src/Propellor/Types/Chroot.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Propellor/Types/Chroot.hs') diff --git a/src/Propellor/Types/Chroot.hs b/src/Propellor/Types/Chroot.hs index 7e7c3630..b7ed7807 100644 --- a/src/Propellor/Types/Chroot.hs +++ b/src/Propellor/Types/Chroot.hs @@ -17,13 +17,13 @@ instance Monoid (ChrootInfo host) where } data ChrootCfg - = ChrootCfg + = NoChrootCfg | SystemdNspawnCfg [(String, Bool)] deriving (Show) instance Monoid ChrootCfg where - mempty = ChrootCfg - mappend _ ChrootCfg = ChrootCfg - mappend ChrootCfg r = r + mempty = NoChrootCfg + mappend v NoChrootCfg = v + mappend NoChrootCfg v = v mappend (SystemdNspawnCfg l1) (SystemdNspawnCfg l2) = SystemdNspawnCfg (l1 <> l2) -- cgit v1.2.3