6 files changed, 148 insertions, 7 deletions
diff --git a/deployment.spec b/deployment.spec
index 3d2e8fa..ca94243 100644
--- a/deployment.spec
+++ b/deployment.spec
@@ -36,6 +36,7 @@ cp AUTHORS COPYING README %{buildroot}/%{_datadir}/doc/%{name}/
 %files
 %defattr(-,root,root,-)
 %{_sysconfdir}/modprobe.d/libertas.conf
+%{_sysconfdir}/X11/xorg.conf.d/zapnot.conf
 %{_sysconfdir}/sugar/blacklist/deployment
 %{_sysconfdir}/sweets.conf
 %{_datadir}/%{name}
diff --git a/etc/sugar/blacklist/deployment b/etc/sugar/blacklist/deployment
index 97744ca..a28dfa9 100644
--- a/etc/sugar/blacklist/deployment
+++ b/etc/sugar/blacklist/deployment
@@ -1,5 +1,6 @@
-# Sweets Distribution configuration happens via sweets.conf only for deployments
-cpsection sweets
+# Uncomment it to hide "Plugins" Control Panel section to
+# hanlde plugins configuration only via configuration files
+#cpsection plugins
 
 # No need in ASLO updater with Sugar Network
 cpsection updater
diff --git a/etc/sweets.conf b/etc/sweets.conf
index bbc15ac..a1dbbcd 100644
--- a/etc/sweets.conf
+++ b/etc/sweets.conf
@@ -1,12 +1,12 @@
 [shell]
 # space separated list of plugins to enable
-plugins = sn client
+plugins = telepathy proxy sn 
 
 [local]
 # url to connect to Sugar Network server API
-api-url = http://api-testing.network.sugarlabs.org
+api-url = http://node.sugarlabs.org
 # space separated list of layers to restrict Sugar Network content by
-layers = peruvian-pilot
+layers = pilot
 
 # sugar-client configuration
 # http://wiki.sugarlabs.org/go/Platform_Team/Server_Kit/sugar-client
diff --git a/image/common.ini b/image/common.ini
index cecf24d..0fa1403 100644
--- a/image/common.ini
+++ b/image/common.ini
@@ -52,7 +52,7 @@ sweets_repository = Factory
 fedora_release = 14
 
 # Url to downstream repository. Put your url here.
-deployment_repository_url = http://download.sugarlabs.org/packages/SweetsDistribution:/Factory:/ReferenceXO/Fedora-14/
+deployment_repository_url = http://download.sugarlabs.org/packages//Hexoquinasa:/1/SweetsDistribution_Factory_Fedora-14/
 # deployment_repository_url = http://download.sugarlabs.org/packages/SweetsDistribution:/Factory:/ReferenceXO/Fedora-%(fedora_release)s/
 
 # Sugar Network layer to restrict list of activities and their versions
diff --git a/image/common_light.ini b/image/common_light.ini
new file mode 100644
index 0000000..429a39a
--- /dev/null
+++ b/image/common_light.ini
@@ -0,0 +1,139 @@
+#
+# Common configuration for all XO models.
+#
+
+[global]
+# Image title.
+# Put your title here.
+customization_info = Hexoquinasa XO distribution
+fedora_release = 14
+
+# Image filename.
+# String should contain one formatting argument to make Python expression,
+# `image_name % latestbuild`, valid. Make sure that you escaped `%` symbol
+# by `%%`. Put your filename here.
+image_name = hxp%%d
+
+# Minimal list of required modules.
+# All of the following modules need to be added to keep final image consistent.
+# `*sugar*` modules are not included on purpose, Sugar related configuration
+# will happen in `sweets-deployment` package added by `sweets` module.
+modules_required =
+    base,
+    repos,
+    yumcfg,
+    powerd,
+    x11,
+#   Include Sweets Distribution specific settings.
+    sweets
+
+# Useful extra modules.
+modules_extra =
+#   Keep current build number in path set by [buildnr_from_file].
+    buildnr_from_file,
+#   Add rpmfusion repositories to image build time and image itself.
+    rpmfusion,
+#   To add extra packages from [custom_packages] section.
+    custom_packages,
+    custom_scripts,
+    signing
+
+[buildnr_from_file]
+# Path to file to keep current image release number.
+# If you change this file manually, make sure that file content doesn't end
+# with new line symbol to avoid fails from `olpc-os-builder` internals.
+path = latestbuild
+
+[sweets]
+# Name of Sweets Distribution repository current one is based on.
+# http://wiki.sugarlabs.org/go/Template:Sweets_Distribution_Linkbar
+# Right now, only "Factory" is accessible.
+sweets_repository = Factory
+fedora_release = 14
+
+# Url to downstream repository. Put your url here.
+deployment_repository_url = http://download.sugarlabs.org/packages//Hexoquinasa:/1/SweetsDistribution_Factory_Fedora-14/
+# deployment_repository_url = http://download.sugarlabs.org/packages/SweetsDistribution:/Factory:/ReferenceXO/Fedora-%(fedora_release)s/
+
+# Sugar Network layer to restrict list of activities and their versions
+# Use Contributor Hub application to set what content should be in such layer
+# TODO Make sugar that his layer is the same as in etc/sweets.conf
+sugar_network_layer = pilot
+
+# List of bundle_ids (or context GUIDs in Sugar Network terms) of activities
+# to prefetch to final image to make them accessible in offline right after
+# flasing. These activities should exist in the Sugar Network. If activities
+# were formed properly, their dependencies will be automatically installed.
+# Put your activities list here.
+offline_activities =
+    org.laptop.WebActivity,
+    org.laptop.Calculate,
+    org.laptop.Chat,
+#org.vpri.EtoysActivity,
+    org.laptop.ImageViewerActivity,
+    org.laptop.sugar.Jukebox,
+    org.laptop.Log,
+    org.laptop.Pippy,
+    org.laptop.sugar.ReadActivity,
+    org.laptop.Terminal,
+    org.laptop.TurtleArtActivity,
+    org.laptop.AbiWordActivity,
+    org.laptop.sugar.Jukebox,
+    org.worldwideworkshop.olpc.JigsawPuzzle,
+    org.laptop.TamTamMini,
+    org.laptop.Memorize,
+    org.gnome.Labyrinth,
+    org.laptop.RecordActivity,
+    org.laptop.Oficina,
+    com.jotaro.ImplodeActivity,
+    org.laptop.physics,
+    org.laptop.MeasureActivity,
+    org.laptop.VncLauncher,
+#net.gcompris,
+#edu.mit.media.ScratchActivity,
+    org.ceibaljam.conozcoamerica,
+    org.sugarlabs.ICanReadActivity,
+#    org.ceibaljam.terronesweeper,
+    org.sugarlabs.SimpleGraph,
+    org.ceibaljam.jamedit,
+    org.laptop.TurtleArtButia,
+    vu.lux.olpc.Speak
+#    org.ceibaljam.agenda,
+#    org.laptop.WikipediaActivity
+
+# List of bundle_ids (or context GUIDs in Sugar Network terms) of activities
+# make them favorited in Sugar Shell Home view. These activities need
+# to be mentioned in `offline_activities` option as well.
+# Put your activities list here.
+favorite_activities =
+    org.laptop.WebActivity,
+#    org.laptop.WikipediaActivity,
+    org.laptop.RecordActivity,
+    org.laptop.Calculate,
+    org.laptop.Chat,
+    org.laptop.TurtleArtActivity,
+    org.laptop.AbiWordActivity,
+    org.laptop.physics,
+    org.laptop.TamTamMini,
+    org.ceibaljam.conozcoamerica,
+    org.laptop.Terminal
+
+[custom_packages]
+add_packages =
+#   Useful packages from rpmfusion repository.
+    gstreamer-plugins-ugly,
+    gstreamer-ffmpeg,
+    mplayer,
+    x11vnc,
+    synergy
+
+[signing]
+extract=1
+bios_crypto_path=/root/bios-crypto
+skey=/root/bios-crypto/build/masterkeys/fs
+okey=/root/bios-crypto/build/masterkeys/os
+wkey=/root/bios-crypto/build/masterkeys/fw
+make_img_fs_zip=1
+
+[custom_scripts]
+custom_script_1 = %(oob_config_dir)s/post.sh
diff --git a/image/latestbuild b/image/latestbuild
index 76a8b2b..176fdeb 100644
--- a/image/latestbuild
+++ b/image/latestbuild
@@ -1 +1 @@
-83
+119
+\ No newline at end of file