teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xbps-src: force reconfiguration of ca-certificates.

This commit is contained in:
Juan RP 2015-10-31 08:19:09 +01:00
parent 0cd87b3cdd
commit 8e7b21a472
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xbps-src
View File

@ -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.
#