From cb6efbcbb39a351c85aa6cb0c4cc70c2d7123f76 Mon Sep 17 00:00:00 2001
From: Jesse Schwartzentruber <truber@mozilla.com>
Date: Fri, 3 Jan 2025 17:09:12 -0500
Subject: [PATCH] [fuzzilli] Use venv for daemon

---
 services/fuzzilli/fuzzilli.sh | 3 +++
 services/fuzzilli/setup.sh    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/services/fuzzilli/fuzzilli.sh b/services/fuzzilli/fuzzilli.sh
index ffd24302..beca423a 100755
--- a/services/fuzzilli/fuzzilli.sh
+++ b/services/fuzzilli/fuzzilli.sh
@@ -120,6 +120,9 @@ then
   trap onexit EXIT
 fi
 
+# ensure fuzzilli daemon uses python in fuzzmanager venv
+. /opt/pipx/venvs/fuzzmanager/bin/activate
+
 if [[ -n "$S3_CORPUS_REFRESH" ]]
 then
   timeout -s 2 ${TARGET_TIME} mozilla/merge.sh "$HOME/build/dist/bin/js"
diff --git a/services/fuzzilli/setup.sh b/services/fuzzilli/setup.sh
index 895ad326..e2871e4e 100755
--- a/services/fuzzilli/setup.sh
+++ b/services/fuzzilli/setup.sh
@@ -29,6 +29,7 @@ EDIT=1 SRCDIR=/src/fuzzing-tc ./fuzzing_tc.sh
 ./fuzzmanager.sh
 ./grcov.sh
 ./llvm-symbolizer.sh
+PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin retry pipx inject fuzzmanager boto
 
 #### Bootstrap Packages