aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorĐoàn Trần Công Danh <congdanhqx@gmail.com>2020-08-18 12:53:55 +0000
committerĐoàn Trần Công Danh <congdanhqx@gmail.com>2020-08-22 06:33:45 +0000
commit339e7c6b4d87a1c48370c70c7eebf5ddf8e7d8ef (patch)
tree9da663a13e62e0f9d1db4ae4b202b8607c2787ea
parent8fc6facbb1e6f20121e7cde435453feda1463138 (diff)
downloadvoid-packages-339e7c6b4d87a1c48370c70c7eebf5ddf8e7d8ef.tar
void-packages-339e7c6b4d87a1c48370c70c7eebf5ddf8e7d8ef.tar.gz
void-packages-339e7c6b4d87a1c48370c70c7eebf5ddf8e7d8ef.tar.bz2
void-packages-339e7c6b4d87a1c48370c70c7eebf5ddf8e7d8ef.tar.lz
void-packages-339e7c6b4d87a1c48370c70c7eebf5ddf8e7d8ef.tar.xz
void-packages-339e7c6b4d87a1c48370c70c7eebf5ddf8e7d8ef.tar.zst
void-packages-339e7c6b4d87a1c48370c70c7eebf5ddf8e7d8ef.zip
xbps-src: use internal config in foreign environment
When xbps-install is called without "-C", xbps-install will pick configuration from the location configured at build time. Should the default location not have a valid repository configuration, we couldn't run binary-bootstrap. On bootstrapping from scratch, without this change, xbps looks into system configuration, which isn't what we want. Run xbps-install with our internal configuration instead.
-rwxr-xr-xxbps-src4
1 files changed, 2 insertions, 2 deletions
diff --git a/xbps-src b/xbps-src
index 2462ddc0b89..1c83708c8da 100755
--- a/xbps-src
+++ b/xbps-src
@@ -613,8 +613,8 @@ if [ "$IN_CHROOT" ]; then
readonly XBPS_BUILDDIR=/builddir
else
readonly XBPS_UHELPER_CMD="xbps-uhelper -r $XBPS_MASTERDIR"
- readonly XBPS_INSTALL_CMD="xbps-install -c $XBPS_HOSTDIR/repocache-$XBPS_MACHINE -r $XBPS_MASTERDIR"
- readonly XBPS_QUERY_CMD="xbps-query -c $XBPS_HOSTDIR/repocache-$XBPS_MACHINE -r $XBPS_MASTERDIR"
+ readonly XBPS_INSTALL_CMD="xbps-install -c $XBPS_HOSTDIR/repocache-$XBPS_MACHINE -r $XBPS_MASTERDIR -C etc/xbps.d"
+ readonly XBPS_QUERY_CMD="xbps-query -c $XBPS_HOSTDIR/repocache-$XBPS_MACHINE -r $XBPS_MASTERDIR -C etc/xbps.d"
readonly XBPS_RECONFIGURE_CMD="xbps-reconfigure -r $XBPS_MASTERDIR"
readonly XBPS_REMOVE_CMD="xbps-remove -r $XBPS_MASTERDIR"
readonly XBPS_CHECKVERS_CMD="xbps-checkvers -r $XBPS_MASTERDIR"