Revert "Simplify passive mode handling (#30593)"

old-commit-hash: 99d51bf02c5a13f3064b012da55634f8a319091e

selfdrive/manager/manager.py

@@ -60,8 +60,12 @@ def manager_init() -> None:
     if params.get(k) is None:
       params.put(k, v)
 
-  # is this a dashcam build?
-  params.put_bool("Passive", bool(int(os.getenv("PASSIVE", "0"))))
+  # is this dashcam?
+  if os.getenv("PASSIVE") is not None:
+    params.put_bool("Passive", bool(int(os.getenv("PASSIVE", "0"))))
+
+  if params.get("Passive") is None:
+    raise Exception("Passive must be set to continue")
 
   # Create folders needed for msgq
   try:

selfdrive/manager/test/test_manager.py

@@ -21,6 +21,7 @@ BLACKLIST_PROCS = ['manage_athenad', 'pandad', 'pigeond']
 @pytest.mark.tici
 class TestManager(unittest.TestCase):
   def setUp(self):
+    os.environ['PASSIVE'] = '0'
     HARDWARE.set_power_save(False)
 
     # ensure clean CarParams

selfdrive/test/helpers.py

@@ -11,6 +11,7 @@ from openpilot.system.version import training_version, terms_version
 
 
 def set_params_enabled():
+  os.environ['PASSIVE'] = "0"
   os.environ['REPLAY'] = "1"
   os.environ['FINGERPRINT'] = "TOYOTA COROLLA TSS2 2019"
   os.environ['LOGPRINT'] = "debug"

selfdrive/ui/installer/continue_dashcam.sh

@@ -1,6 +1,4 @@
 #!/usr/bin/bash
 
-export PASSIVE=1
-
 cd /data/openpilot
-exec ./launch_openpilot.sh
+exec ./launch_chffrplus.sh