builder: Use pakfire_execute to run shell

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

diff --git a/src/pakfire/builder.py b/src/pakfire/builder.py
index 45d7065b053943ba8d368e3083250d8e6a1c7a66..0eae84a245a5b26196ff2d740974c856d5b2aeb7 100644 (file)
--- a/src/pakfire/builder.py
+++ b/src/pakfire/builder.py
@@ -437,7 +437,7 @@ class BuilderContext(object):
                env = {
                        "HOME" : "/root",
                        "PATH" : "/usr/bin:/bin:/usr/sbin:/sbin",
-                       "PS1"  : "\\u:\w\$ ",
+                       "PS1"  : "pakfire-chroot \w> ",
                        "TERM" : os.environ.get("TERM", "vt100"),
                        "LANG" : os.environ.get("LANG", "en_US.UTF-8"),
                }
@@ -521,17 +521,8 @@ class BuilderContext(object):
                if install:
                        packages += install
 
+               # Install all required packages
                self._install(packages)
 
-               command = "/usr/sbin/chroot %s %s %s" % (self.chrootPath(), SHELL_SCRIPT)
-
-               for key, val in list(self.environ.items()):
-                       command = "%s=\"%s\" " % (key, val) + command
-
-               # Empty the environment
-               command = "env -i - %s" % command
-
-               self.log.debug("Shell command: %s" % command)
-
-               shell = os.system(command)
-               return os.WEXITSTATUS(shell)
+               # Enter the shell
+               self.pakfire.execute(["/usr/bin/bash", "--login"], environ=self.environ)