diff options
| -rw-r--r-- | src/Process.hs | 3 | ||||
| -rw-r--r-- | src/Run.hs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Process.hs b/src/Process.hs index 48ed40f..376b1ba 100644 --- a/src/Process.hs +++ b/src/Process.hs @@ -93,7 +93,8 @@ spawnOn target pname killWith cmd = do let prefix = T.unpack $ "ip netns exec \"" <> textNetnsName netns <> "\" " (Just hin, Just hout, Just herr, handle) <- liftIO $ createProcess (shell $ prefix ++ cmd) { std_in = CreatePipe, std_out = CreatePipe, std_err = CreatePipe - , env = Just [("EREBOS_DIR", either netDir nodeDir target)] + , cwd = Just (either netDir nodeDir target) + , env = Just [ ( "EREBOS_DIR", "." ) ] } pout <- liftIO $ newTVarIO [] @@ -177,7 +177,7 @@ withNetwork :: Network -> (Network -> TestRun a) -> TestRun a withNetwork net inner = do tcpdump <- liftIO (findExecutable "tcpdump") >>= return . \case Just path -> withProcess (Left net) ProcNameTcpdump (Just softwareTermination) - (path ++ " -i br0 -w '" ++ netDir net ++ "/br0.pcap' -U -Z root") . const + (path ++ " -i br0 -w './br0.pcap' -U -Z root") . const Nothing -> id tcpdump $ inner net |