[scripts] remove mangling of repositories.conf.d

This commit is contained in:
Fabio Erculiani
2014-11-30 15:54:41 +00:00
parent 1a1e25db1e
commit de0da7ccac
4 changed files with 14 additions and 28 deletions
+2 -8
View File
@@ -69,6 +69,8 @@ if [ -n "${UPGRADE_REPO}" ]; then
echo "Upgrading system by enabling ${UPGRADE_REPO}"
equo repo enable "${UPGRADE_REPO}" || exit 1
FORCE_EAPI=2 safe_run equo update || exit 1
equo repo mirrorsort "${UPGRADE_REPO}" # ignore errors
ETP_NONINTERACTIVE=1 safe_run equo upgrade --fetch || exit 1
ETP_NONINTERACTIVE=1 equo upgrade --purge || exit 1
echo "-5" | equo conf update
@@ -163,14 +165,6 @@ umount /proc
equo deptest --pretend
emaint --fix world
# copy entropy repositories config
# the one in chroots is optimized to use Garr mirror
cp /etc/entropy/repositories.conf.example /etc/entropy/repositories.conf -p
for repo_conf in /etc/entropy/repositories.conf.d/entropy_*.example; do
new_repo_conf="${repo_conf%.example}"
cp "${repo_conf}" "${new_repo_conf}"
done
# copy Portage config from sabayonlinux.org entropy repo to system
for conf in package.mask package.unmask package.keywords make.conf package.use; do
repo_path=/var/lib/entropy/client/database/*/sabayonlinux.org/standard