From 4e5048727e7316d4101be19d4f1e42d72d008adb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 20 Oct 2015 14:45:11 -0400 Subject: privdata propigation for Spin.controller Controlling host inherits the privdata for the host it spins, and sends it along to that host. --- src/Propellor/CmdLine.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/Propellor/CmdLine.hs') diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index e0830693..a0be167e 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -117,9 +117,10 @@ defaultMain hostlist = do go _ Merge = mergeSpin go True cmdline@(Spin _ _) = buildFirst cmdline $ go False cmdline go True cmdline = updateFirst cmdline $ go False cmdline - go False (Spin hs r) = do + go False (Spin hs mrelay) = do commitSpin - forM_ hs $ \hn -> withhost hn $ spin hn r + forM_ hs $ \hn -> withhost hn $ + spin (maybe RegularSpin RelaySpin mrelay) hn go False cmdline@(SimpleRun hn) = buildFirst cmdline $ go False (Run hn) go False (Run hn) = ifM ((==) 0 <$> getRealUserID) -- cgit v1.2.3