test changes and post-install client conf script, and proxy script

3 files changed, 21 insertions, 6 deletions

diff --git a/config/dextrose3-common.ini b/config/dextrose3-common.ini
index 51bbe2b..d8d2073 100644
--- a/config/dextrose3-common.ini
+++ b/config/dextrose3-common.ini
@@ -15,6 +15,7 @@ dx3_common_modules=
 	sugar,
 	sugarlabs_activities,
 	sugar_activities_extra,
+	sugar_activity_group,
 	custom_packages,
 	custom_scripts
 dx3_common_packages_add=
@@ -45,6 +46,9 @@ dx3_common_packages_add=
 ; first and disregarding the dependencies of the DX3 versions of Sugar.
 	python-xlib,
 	upower,
+; Wasn't being picked automatically unlike previous builds	
+	chkconfig,
+	sugar-hidden-network-connect,
 
 [global]
 fedora_release=14
@@ -68,7 +72,7 @@ olpc_publicrpms_1=1,f14
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 custom_repo_1=1,dextrose,http://download.sugarlabs.org/dextrose/testing/dx3/rpms/i386/os
 custom_repo_2=1,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os
-custom_repo_3=1,dextrose-next,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os
+custom_repo_3=1,dextrose-next,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-next/i386/os
 ;custom_repo_3=1,upstream-cherries,http://download.sugarlabs.org/dextrose/testing/dx3/upstream-cherries/i386/os
 
 [custom_packages]
@@ -109,7 +113,7 @@ del_packages=
 addrepo_1=1,dextrose,http://download.sugarlabs.org/dextrose/testing/dx3/rpms/i386/os
 addrepo_2=1,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os
 addrepo_3=1,olpc-f14,http://rpmdropbox.laptop.org/f14/
-addrepo_4=1,dextrose-next,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os
+addrepo_4=1,dextrose-next,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-next/i386/os
 ;addrepo_4=1,upstream-cherries,http://download.sugarlabs.org/dextrose/testing/dx3/upstream-cherries/i386/os
 force_enable=fedora-updates-testing
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
@@ -204,6 +208,10 @@ activities=
 	org.sugarlabs.IRC,
 
 
+[sugar_activity_group]
+url=http://wiki.laptop.org/go/Activities/G1G1Lite
+install_activities=0
+
 [sugar_activities_extra]
 
 
@@ -212,7 +220,8 @@ path=buildnr-dx3
 
 [custom_scripts]
 custom_script_1=%(oob_config_dir)s/disable_mesh.sh
-custom_script_1=%(oob_config_dir)s/sugar-client-conf.sh
+custom_script_2=%(oob_config_dir)s/sugar-client-conf.sh
+custom_script_3=%(oob_config_dir)s/yum_proxy.sh
 
 [bootanim]
 imgdir=%(oob_config_dir)s/../bootanim
diff --git a/config/sugar-client-conf.sh b/config/sugar-client-conf.sh
index 46f4b8f..8941dd8 100644
--- a/config/sugar-client-conf.sh
+++ b/config/sugar-client-conf.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 
 # Configure sugar-client for yum based automatic updater
-sugar-client-service config --update-args='--disablerepo=* --enablerepo=dextrose' > /etc/sugar-client.conf
+${INSTALL_ROOT}/usr/bin/sugar-client-service config --update-args='--disablerepo=* --enablerepo=dextrose --enablerepo=dextrose-next' > ${INSTALL_ROOT}/etc/sugar-client.conf
 
-cat /etc/sugar-client.conf
+cat ${INSTALL_ROOT}/etc/sugar-client.conf
+
+# Create /etc/cron.hourly directory if not already present
+mkdir -p ${INSTALL_ROOT}/etc/cron.hourly
 
 # Link /usr/sbin/dextrose-updater to cron.hourly/.
-#ln -s /usr/sbin/dextrose-updater /etc/cron.hourly/. 
+ln -s ${INSTALL_ROOT}/usr/sbin/dextrose-updater ${INSTALL_ROOT}/etc/cron.hourly/. 
diff --git a/config/yum_proxy.sh b/config/yum_proxy.sh
new file mode 100644
index 0000000..44e53a9
--- /dev/null
+++ b/config/yum_proxy.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "include=/tmp/yum.mod.conf" >> ${INSTALL_ROOT}/etc/yum.conf