summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Systemd.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-20 12:26:42 -0400
committerJoey Hess2015-10-20 12:26:42 -0400
commit99b8c0c160e9ab2880143bb17ccb19ff48a6678c (patch)
treefc281205282760a67c03a706590ce37f49e3a012 /src/Propellor/Property/Systemd.hs
parent877b2002823fb304b4aa7c8ad8ee0cb4c50ef7df (diff)
parent4c0b1f6e643882f43ac936b6bfdee78593ebc1d5 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Systemd.hs')
-rw-r--r--src/Propellor/Property/Systemd.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index 3f20a9e2..d5373e15 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -206,7 +206,7 @@ container name mkchroot = Container name c h
-- Reverting this property stops the container, removes the systemd unit,
-- and deletes the chroot and all its contents.
nspawned :: Container -> RevertableProperty
-nspawned c@(Container name (Chroot.Chroot loc system builderconf _) h) =
+nspawned c@(Container name (Chroot.Chroot loc system builder _) h) =
p `describe` ("nspawned " ++ name)
where
p = enterScript c
@@ -226,7 +226,7 @@ nspawned c@(Container name (Chroot.Chroot loc system builderconf _) h) =
<!>
doNothing
- chroot = Chroot.Chroot loc system builderconf h
+ chroot = Chroot.Chroot loc system builder h
-- | Sets up the service file for the container, and then starts
-- it running.