diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index a7100d4..3c71cab 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -8,22 +8,22 @@ install_base_chroot() { XBPS_TARGET_PKG="$1" fi # binary bootstrap - msg_normal "xbps-src: installing base-chroot...\n" + msg_normal "xbps-src: installing base-chroot-cereus...\n" # XBPS_TARGET_PKG == arch if [ "$XBPS_TARGET_PKG" ]; then _bootstrap_arch="env XBPS_TARGET_ARCH=$XBPS_TARGET_PKG" fi (export XBPS_MACHINE=$XBPS_TARGET_PKG XBPS_ARCH=$XBPS_TARGET_PKG; chroot_sync_repodata) - ${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot + ${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot-cereus if [ $? -ne 0 ]; then - msg_error "xbps-src: failed to install base-chroot!\n" + msg_error "xbps-src: failed to install base-chroot-cereus!\n" fi # Reconfigure base-files to create dirs/symlinks. if xbps-query -r $XBPS_MASTERDIR base-files &>/dev/null; then XBPS_ARCH=$XBPS_TARGET_PKG xbps-reconfigure -r $XBPS_MASTERDIR -f base-files &>/dev/null fi - msg_normal "xbps-src: installed base-chroot successfully!\n" + msg_normal "xbps-src: installed base-chroot-cereus successfully!\n" chroot_prepare $XBPS_TARGET_PKG || msg_error "xbps-src: failed to initialize chroot!\n" chroot_check chroot_handler clean @@ -34,7 +34,7 @@ reconfigure_base_chroot() { local pkgs="glibc-locales ca-certificates" [ -z "$IN_CHROOT" -o -e $statefile ] && return 0 # Reconfigure ca-certificates. - msg_normal "xbps-src: reconfiguring base-chroot...\n" + msg_normal "xbps-src: reconfiguring base-chroot-cereus...\n" for f in ${pkgs}; do if xbps-query -r $XBPS_MASTERDIR $f &>/dev/null; then xbps-reconfigure -r $XBPS_MASTERDIR -f $f @@ -51,7 +51,7 @@ update_base_chroot() { if $(${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -nu|grep -q xbps); then ${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -yu xbps || msg_error "xbps-src: failed to update xbps!\n" fi - ${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -yu || msg_error "xbps-src: failed to update base-chroot!\n" + ${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -yu || msg_error "xbps-src: failed to update base-chroot-cereus!\n" msg_normal "xbps-src: cleaning up $XBPS_MASTERDIR masterdir...\n" [ -z "$XBPS_KEEP_ALL" -a -z "$XBPS_SKIP_DEPS" ] && remove_pkg_autodeps [ -z "$XBPS_KEEP_ALL" -a -z "$keep_all_force" ] && rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir