summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-11-21 13:55:42 -0400
committerJoey Hess2014-11-21 13:55:42 -0400
commit09e79e6263db1f7309b9787585d797e46c6905b9 (patch)
tree0a78c79d5b6fd3874a678737ac603170e177dfac
parent3ba82a1c9c27f1e79eeecfcfad7bbb9dce653488 (diff)
propellor spin
-rw-r--r--src/Propellor/Property/Systemd.hs10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index 3547f604..428d11b9 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -88,9 +88,10 @@ container name system ps = Container name system ps (Host name [] mempty)
nspawned :: Container -> RevertableProperty
nspawned c@(Container name system _ h) = RevertableProperty setup teardown
where
- setup = propertyList ("nspawned " ++ name) (map toProp steps)
- teardown = propertyList ("not nspawned " ++ name)
- (map (toProp . revert) (reverse steps))
+ setup = propertyList ("nspawned " ++ name) $
+ map toProp steps ++ [containerprovisioned]
+ teardown = propertyList ("not nspawned " ++ name) $
+ map (toProp . revert) (reverse steps)
steps =
[ enterScript c
, chrootprovisioned
@@ -141,6 +142,7 @@ enterScript c@(Container name _ _ _) = RevertableProperty setup teardown
, "if [ -n \"$pid\" ]; then"
, "\tnsenter -p -u -n -i -m -t \"$pid\""
, "else"
+ , "\techo container not running >&2"
, "\texit 1"
, "fi"
]
@@ -150,7 +152,7 @@ enterScript c@(Container name _ _ _) = RevertableProperty setup teardown
scriptfile = enterScriptFile c
enterScriptFile :: Container -> FilePath
-enterScriptFile (Container name _ _ _ ) = "enter-" ++ mungename name
+enterScriptFile (Container name _ _ _ ) = "/usr/local/bin/enter-" ++ mungename name
enterContainerProcess :: Container -> [String] -> CreateProcess
enterContainerProcess = proc . enterScriptFile