diff --git a/xbps-src b/xbps-src index 2127dc84900..0a09cba0ba6 100755 --- a/xbps-src +++ b/xbps-src @@ -284,7 +284,7 @@ install_bbootstrap() { mkdir -p $XBPS_MASTERDIR/var/db/xbps/keys cd $XBPS_MASTERDIR cp -f $XBPS_COMMONDIR/repo-keys/*.plist $XBPS_MASTERDIR/var/db/xbps/keys - ${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS:+-S $XBPS_INSTALL_ARGS} -yU base-chroot${_subarch} + ${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS:+-S $XBPS_INSTALL_ARGS} -y base-chroot${_subarch} if [ $? -ne 0 ]; then msg_error "Failed to install bootstrap packages!\n" fi @@ -294,6 +294,10 @@ install_bbootstrap() { else XBPS_ARCH=$XBPS_TARGET_PKG xbps-reconfigure -r $XBPS_MASTERDIR -f base-files &>/dev/null fi + # Reconfigure ca-certificates. + if xbps-query -r $XBPS_MASTERDIR ca-certificates &>/dev/null; then + XBPS_ARCH=$XBPS_TARGET_PKG xbps-reconfigure -r $XBPS_MASTERDIR -f ca-certificates &>/dev/null + fi msg_normal "Installed bootstrap successfully!\n" chroot_prepare $XBPS_TARGET_PKG || msg_error "Failed to initialize chroot!\n" } @@ -602,10 +606,6 @@ if [ -z "$IN_CHROOT" ]; then fi fi -if [ -n "$IN_CHROOT" ]; then - xbps-reconfigure -a &>/dev/null -fi - # # Main switch. #