summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorXavier Chantry <shiningxc@gmail.com>2009-03-15 12:43:39 +0100
committerDan McGee <dan@archlinux.org>2009-03-15 11:41:37 -0500
commitde97282fbd78755cde71c1d064ec00b806efcca5 (patch)
treedc1a066d0db68e23e39d1f13b0be248f1465d38a /lib
parent36863b968f562840461e60be4ed23abf635d6008 (diff)
Revert "popen does NOT require /bin/sh in a subchroot"
This reverts commit 9558639d8009483fbf422b138d020745986f82f1. This change was wrong, popen does require /bin/sh in a subchroot. 1) pacman -S lilo -r root Notice no error 2) rm root/bin/sh ; pacman -S lilo -r root Notice an error : error: scriptlet failed to execute correctly Actually, we already get an explicit error here, when popen is run, so there is no need to check for bin/sh explicitely. Besides this check was problematic in some cases. For example, bash itself has a scriptlet, but only post_install and post_upgrade, no pre_install and pre_upgrade. However, since bash has a scriptlet, runscriptlet will also be called before bash is installed. It won't do anything since the scriptlet has no pre_install function. But if we keep the check, we will still get "error : no /bin/sh". Conflicts: lib/libalpm/trans.c Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/trans.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index ae01e3fa..243cdc10 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -443,13 +443,6 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
return(0);
}
- /* NOTE: popen will use the PARENT's /bin/sh, not the chroot's */
- if(access("/bin/sh", X_OK)) {
- /* not found */
- _alpm_log(PM_LOG_ERROR, _("No /bin/sh in parent environment, aborting scriptlet\n"));
- return(0);
- }
-
/* creates a directory in $root/tmp/ for copying/extracting the scriptlet */
snprintf(tmpdir, PATH_MAX, "%stmp/", root);
if(access(tmpdir, F_OK) != 0) {