From b47c5166ac84bdb1ae04d9d4b68e484734f5baa0 Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@gentoo.org>
Date: Thu, 6 Sep 2018 21:08:01 +0200
Subject: [PATCH] Update repos after installing enman

---
 scripts/remaster_generic_inner_chroot_script.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/scripts/remaster_generic_inner_chroot_script.sh b/scripts/remaster_generic_inner_chroot_script.sh
index 59e1401..b60d689 100755
--- a/scripts/remaster_generic_inner_chroot_script.sh
+++ b/scripts/remaster_generic_inner_chroot_script.sh
@@ -25,6 +25,14 @@ safe_run() {
 # make sure there is no stale pid file around that prevents entropy from running
 rm -f /run/entropy/entropy.lock
 
+
+FORCE_EAPI=2 safe_run equo update || exit 1
+
+for repo in $(equo repo list -q); do
+  echo "Optimizing mirrors for ${repo}"
+  equo repo mirrorsort "${repo}"  # ignore errors
+done
+
 # Add additional enman repositories:
 # For customized images
 if [ -n "${SABAYON_ENMAN_REPOS}" ] ; then
@@ -34,15 +42,10 @@ if [ -n "${SABAYON_ENMAN_REPOS}" ] ; then
     echo "Adding enman repos ${repos}..."
     safe_run enman add ${repos} || exit 1
   done
+
+  FORCE_EAPI=2 safe_run equo update || exit 1
 fi
 
-FORCE_EAPI=2 safe_run equo update || exit 1
-
-for repo in $(equo repo list -q); do
-  echo "Optimizing mirrors for ${repo}"
-  equo repo mirrorsort "${repo}"  # ignore errors
-done
-
 # Unmask packages (used on custom ISO)
 if [ -n "${SABAYON_UNMASK_PKGS}" ] ; then
   touch /etc/entropy/packages/package.unmask