From b86dc506337021c84fe836aed3fcaf1a643cc462 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Mar 2017 14:53:45 -0400 Subject: Changed Chroot data type to include Info propigation This will allow for different Chroots that propigate info differently. hostChroot will use this. This commit was sponsored by Peter Hogg on Patreon. --- src/Propellor/Property/Systemd.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Propellor/Property/Systemd.hs') diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs index e1e20974..8f9c3beb 100644 --- a/src/Propellor/Property/Systemd.hs +++ b/src/Propellor/Property/Systemd.hs @@ -259,7 +259,7 @@ debContainer name ps = container name $ \d -> Chroot.debootstrapped mempty d ps -- Reverting this property stops the container, removes the systemd unit, -- and deletes the chroot and all its contents. nspawned :: Container -> RevertableProperty (HasInfo + Linux) Linux -nspawned c@(Container name (Chroot.Chroot loc builder _) h) = +nspawned c@(Container name (Chroot.Chroot loc builder _ _) h) = p `describe` ("nspawned " ++ name) where p :: RevertableProperty (HasInfo + Linux) Linux @@ -271,7 +271,7 @@ nspawned c@(Container name (Chroot.Chroot loc builder _) h) = -- Chroot provisioning is run in systemd-only mode, -- which sets up the chroot and ensures systemd and dbus are -- installed, but does not handle the other properties. - chrootprovisioned = Chroot.provisioned' (Chroot.propagateChrootInfo chroot) chroot True + chrootprovisioned = Chroot.provisioned' chroot True -- Use nsenter to enter container and and run propellor to -- finish provisioning. @@ -281,7 +281,7 @@ nspawned c@(Container name (Chroot.Chroot loc builder _) h) = doNothing - chroot = Chroot.Chroot loc builder h + chroot = Chroot.Chroot loc builder (Chroot.propagateChrootInfo chroot) h -- | Sets up the service file for the container, and then starts -- it running. -- cgit v1.3-2-g0d8e