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 f851b23b06b60f1ce90359e3eeb42073cece18dc..3d3f6ca94b3a9e81a01f1807d69dea023393bd55 100644 (file)
--- 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 775d780e9396c319a729fe5b8f14d978f217f124..a4b8e63a614511f2ce3f74d81aee8a94bb205587 100644 (file)
--- 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 be7d46730d4162ed6b00bceb99b7071cd3fcf8f6..9ace9b7c80db112e7ef89cd65c576c4a6162c094 100644 (file)
--- 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                              #