From a8bf7bae6218e53f1f2a8d2f858758577e3447b9 Mon Sep 17 00:00:00 2001
From: Bernie Innocenti <bernie@codewiz.org>
Date: Sun, 15 Aug 2010 05:24:16 +0000
Subject: Resync dextrose-xo1.ini

---
diff --git a/examples/dextrose-xo1.ini b/examples/dextrose-xo1.ini
index 766ef99..02ecdc2 100644
--- a/examples/dextrose-xo1.ini
+++ b/examples/dextrose-xo1.ini
@@ -31,10 +31,10 @@ modules=
 customization_info=Paraguay
 
 [repos]
-fedora=fedora,fedora-updates,fedora-updates-testing
+fedora=fedora,fedora-updates
 olpc_publicrpms_1=1,f11
 custom_repo_1=1,dextrose-f11-0.88,http://download.sugarlabs.org/dextrose/testing/f11-0.88/rpms/i386/os
-custom_repo_2=1,f11-freeworld,http://repo.paraguayeduca.org/f11-freeworld/i386/os
+custom_repo_2=1,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/f11-0.88/rpms-freeworld/i386/os
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [custom_packages]
@@ -58,7 +58,6 @@ del_packages=
 	dump,
 	finger,
 	ftp,
-	gconf,
 	kacst-fonts,
 	khmeros-base-fonts,
 	krb5-workstation,
@@ -89,11 +88,9 @@ del_packages=
 	yp-tools,
 	ypbind,
 
-;	prelink,
-
 [yumcfg]
 addrepo_1=1,dextrose,http://download.sugarlabs.org/dextrose/testing/f11-0.88/rpms/i386/os
-addrepo_2=1,f11-freeworld,http://repo.paraguayeduca.org/f11-freeworld/i386/os
+addrepo_2=1,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/f11-0.88/rpms-freeworld/i386/os
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 
@@ -199,7 +196,7 @@ suffix=pyg
 path=oob-buildnr-0.88
 
 [signing]
-bios_crypto_path=/home/bernie/src/olpc/bios-crypto
+bios_crypto_path=/home/bernie/src/olpc/dextrose/bios-crypto
 skey=/home/bernie/src/olpc/keys/pys1
 okey=/home/bernie/src/olpc/keys/pyo1
 wkey=/home/bernie/src/olpc/keys/pyw1
--
cgit v0.9.1