From c910463c2b8607f1a62bc60cc06faead4fff9734 Mon Sep 17 00:00:00 2001
From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@gentoo.org>
Date: Sat, 13 Oct 2012 13:18:29 +0000
Subject: [PATCH] Update config files. Add a config file for skimmer and allow
 the auto files to import a config file per host by reading from
 /etc/catalyst/local.

---
 config/amd64-auto.conf              | 3 ++-
 config/amd64-dev.env                | 4 ----
 config/{x86-dev.env => skimmer.env} | 1 -
 config/x86-auto.conf                | 3 ++-
 4 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 config/amd64-dev.env
 rename config/{x86-dev.env => skimmer.env} (71%)

diff --git a/config/amd64-auto.conf b/config/amd64-auto.conf
index 93e968ea..5fc4f5c7 100644
--- a/config/amd64-auto.conf
+++ b/config/amd64-auto.conf
@@ -3,7 +3,8 @@ portdir="/release/trees/portage-auto"
 options="autoresume kerncache pkgcache seedcache snapcache"
 sharedir="/usr/lib64/catalyst/"
 storedir="/release/buildroot/amd64-dev"
-envscript="/etc/catalyst/release/amd64-dev.env"
+snapshot_cache="/release/tmp/snapshots"
+envscript="/etc/catalyst/local/host.env"
 hash_function="crc32"
 digests="sha512 whirlpool"
 contents="auto"
diff --git a/config/amd64-dev.env b/config/amd64-dev.env
deleted file mode 100644
index baceb002..00000000
--- a/config/amd64-dev.env
+++ /dev/null
@@ -1,4 +0,0 @@
-#export GENTOO_MIRRORS="http://gentoo.osuosl.org/"
-export GENTOO_MIRRORS="http://mirror.ovh.net/gentoo-distfiles/"
-export FEATURES="parallel-fetch"
-export MAKEOPTS="-j5 -l4"
diff --git a/config/x86-dev.env b/config/skimmer.env
similarity index 71%
rename from config/x86-dev.env
rename to config/skimmer.env
index 36e89a78..d18400fe 100644
--- a/config/x86-dev.env
+++ b/config/skimmer.env
@@ -1,4 +1,3 @@
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/"
 export GENTOO_MIRRORS="http://mirror.ovh.net/gentoo-distfiles/"
 export FEATURES="parallel-fetch"
 export MAKEOPTS="-j5 -l4"
diff --git a/config/x86-auto.conf b/config/x86-auto.conf
index 5067b658..3e37bb00 100644
--- a/config/x86-auto.conf
+++ b/config/x86-auto.conf
@@ -3,7 +3,8 @@ portdir="/release/trees/portage-auto"
 options="autoresume kerncache pkgcache seedcache snapcache"
 sharedir="/usr/lib64/catalyst/"
 storedir="/release/buildroot/x86-dev"
-envscript="/etc/catalyst/release/x86-dev.env"
+snapshot_cache="/release/tmp/snapshots"
+envscript="/etc/catalyst/local/host.env"
 hash_function="crc32"
 digests="sha512 whirlpool"
 contents="auto"