set /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/root/bin globally in Jail.env

Author: Stefan Grönke + Igor Galić

libioc/Jail.py

@@ -2175,6 +2175,14 @@ def env(self) -> typing.Dict[str, str]:
 
         jail_env["IOC_JAIL_PATH"] = self.root_dataset.mountpoint
         jail_env["IOC_JID"] = str(self.jid)
+        jail_env["PATH"] = ":".join((
+            "/sbin",
+            "/bin",
+            "/usr/sbin",
+            "/usr/bin",
+            "/usr/local/sbin",
+            "/usr/local/bin",
+        ))
 
         return jail_env
 

libioc/Provisioning/puppet.py

@@ -202,10 +202,6 @@ def provision(
     )
 
     try:
-        env = {
-            'PATH':
-            '/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin'
-        }
         puppet_dir = "/usr/local/etc/puppet"
         if self.source.remote is True:
 
@@ -232,7 +228,7 @@ def provision(
                     "deploy",
                     "environment",
                     "-pv"
-                ], env=env )
+                ])
             except Exception as e:
                 yield r10kDeployEvent.fail(e)
                 raise e
@@ -251,7 +247,7 @@ def provision(
                 "--logdest",
                 "syslog",
                 f"{puppet_env_dir}/production/manifests/site.pp"
-            ], env=env)
+            ])
             yield puppetApplyEvent.end()
         except Exception as e:
             yield puppetApplyEvent.fail(e)