From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 29 Nov 2022 16:44:36 +0000 (+0000)
Subject: jail: Set a default PATH to avoid using login shells everywhere
X-Git-Tag: 0.9.28~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7ad6d4f910d9ef326897864a8ac356e2e8165ea;p=pakfire.git

jail: Set a default PATH to avoid using login shells everywhere

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index f851b23b0..3d3f6ca94 100644
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -463,7 +463,7 @@ static int pakfire_build_package_add_scriptlet(struct pakfire_build* build,
 	int r;
 
 	// Wrap scriptlet into a shell script
-	r = asprintf(&shell, "#!/bin/sh --login\n\nset -e\n\n%s\n\nexit 0\n", data);
+	r = asprintf(&shell, "#!/bin/sh\n\nset -e\n\n%s\n\nexit 0\n", data);
 	if (r < 0)
 		goto ERROR;
 
diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c
index 775d780e9..a4b8e63a6 100644
--- a/src/libpakfire/jail.c
+++ b/src/libpakfire/jail.c
@@ -65,6 +65,7 @@ static const struct environ {
 	const char* val;
 } ENV[] = {
 	{ "LANG", "en_US.utf-8" },
+	{ "PATH", "/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin", },
 	{ "TERM", "vt100" },
 	{ NULL, NULL },
 };
diff --git a/src/scripts/find-prerequires b/src/scripts/find-prerequires
index be7d46730..9ace9b7c8 100644
--- a/src/scripts/find-prerequires
+++ b/src/scripts/find-prerequires
@@ -1,4 +1,4 @@
-#!/bin/bash --login
+#!/bin/bash
 ###############################################################################
 #                                                                             #
 # Pakfire - The IPFire package management system                              #