From 22c9a818109a8d194c85d9852172611a72bc17df Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 3 Sep 2015 07:36:50 +0200 Subject: [PATCH] xbps-src: set $SHELL in the chroot target. ... otherwise it's set to /bin/xbps-shell and might give unexpected results with packages that expect something else. Suggested by @chris2. --- common/xbps-src/shutils/chroot.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index d3cd929b514..e023ef48a3a 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -32,7 +32,7 @@ XBPS_SRC_VERSION="$XBPS_SRC_VERSION" PATH=/void-packages:/usr/bin:/usr/sbin -exec env -i PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" @@XARCH@@ \ +exec env -i SHELL=/bin/sh PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" @@XARCH@@ \ CCACHE_DIR="/host/ccache" IN_CHROOT=1 LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \ PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h _EOF @@ -197,7 +197,8 @@ chroot_handler() { [ -n "$XBPS_BINPKG_EXISTS" ] && arg="$arg -E" action="$arg $action" - env -i PATH="/usr/bin:/usr/sbin:$PATH" HOME=/tmp IN_CHROOT=1 LANG=en_US.UTF-8 \ + env -i PATH="/usr/bin:/usr/sbin:$PATH" SHELL=/bin/sh \ + HOME=/tmp IN_CHROOT=1 LANG=en_US.UTF-8 \ $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \ $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \ /void-packages/xbps-src $action $pkg