Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "xbps-src/chroot.sh: sanitize PATH." #12875

Conversation

Johnnynator
Copy link
Member

This reverts commit e0e48d6.

This commit broke xbps-src on Distros with split bin sbin like Debian

@Johnnynator
Copy link
Member Author

@xtraeme

@Johnnynator Johnnynator force-pushed the revert-e0e48d6f6a3e3975bd867d5ae9485ebfbb76a687 branch from a12297b to 2f7978d Compare July 7, 2019 07:05
@Johnnynator
Copy link
Member Author

I didn't fully investigate it, just that it never configured the chroot.

@Johnnynator
Copy link
Member Author

Johnnynator commented Jul 7, 2019

+ action=' -j1 pkg'
+ env -i -- PATH=/usr/bin SHELL=/bin/sh HOME=/tmp IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 SOURCE_DATE_EPOCH= XBPS_ALLOW_CHROOT_BREAKOUT= /home/john/void-packages-test/common/chroot-style/uunshare.sh /home/john/void-packages-test/masterdir /home/john/void-packages-test /home/john/void-packages-test/hostdir '' /void-packages/xbps-src -j1 pkg dash
+ rv=1
+ return 1
+ exit_and_cleanup 1
+ local rval=1
+ '[' -n '' -a '' '!=' 1 ']'
+ exit 1

Mh.. true, it is actually /usr/local/bin that would been missing, since this is where I have the xbps tools installed

@Johnnynator
Copy link
Member Author

Found my mistake

This partially reverts commit e0e48d6

This commit broke xbps-src when the xbps tools weren't in /usr/bin
@Johnnynator Johnnynator force-pushed the revert-e0e48d6f6a3e3975bd867d5ae9485ebfbb76a687 branch from 2f7978d to acf4730 Compare July 7, 2019 07:17
@Johnnynator
Copy link
Member Author

Johnnynator commented Jul 7, 2019

Nope, doesn't work with you xbps-src-ultra-fast. It never adds this PATH in front of the chroot command.

@Johnnynator Johnnynator merged commit 506c2fa into void-linux:master Jul 7, 2019
@Johnnynator Johnnynator deleted the revert-e0e48d6f6a3e3975bd867d5ae9485ebfbb76a687 branch July 7, 2019 07:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant