Latest changes from feedback (DontZap, Jabber).

7 files changed, 38 insertions, 11 deletions

diff --git a/etc/X11/xorg.conf.d/zapnot.conf b/etc/X11/xorg.conf.d/zapnot.conf
new file mode 100644
index 0000000..e4e79c9
--- /dev/null
+++ b/etc/X11/xorg.conf.d/zapnot.conf
@@ -0,0 +1,9 @@
+Section "ServerFlags"
+    Option "DontZap" "false"
+EndSection
+
+Section "InputClass"
+    Identifier      "Keyboard Defaults"
+    MatchIsKeyboard "yes"
+    Option          "XkbOptions" "terminate:ctrl_alt_bksp"
+EndSection
diff --git a/image/common.ini b/image/common.ini
index 2bc2580..cecf24d 100644
--- a/image/common.ini
+++ b/image/common.ini
@@ -38,16 +38,6 @@ modules_extra =
     custom_scripts,
     signing
 
-[repos]
-
-fedora_arch = i386
-fedora = fedora,fedora_updates
-olpc_frozen_1 = 1,local.11.3.1
-olpc_frozen_2 = 1,local.11.3.0-xo1
-olpc_frozen_3 = 1,local.11.3.1-xo1
-add_excludes_to = fedora,fedora-updates,fedora-updates-testing
-
-
 [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
@@ -123,6 +113,7 @@ favorite_activities =
     org.laptop.physics,
     org.laptop.TamTamMini,
     org.ceibaljam.conozcoamerica,
+    org.laptop.Terminal
 
 [custom_packages]
 add_packages =
diff --git a/image/latestbuild b/image/latestbuild
index c147342..76a8b2b 100644
--- a/image/latestbuild
+++ b/image/latestbuild
@@ -1 +1 @@
-81
\ No newline at end of file
+83
diff --git a/image/post.sh b/image/post.sh
index 8fa4d37..b38feb5 100755
--- a/image/post.sh
+++ b/image/post.sh
@@ -11,6 +11,11 @@ echo Installing homepage
 mkdir -p usr/share/library-common
 cp $src_root/../hx_home/*  usr/share/library-common/
 
+echo Installing boot-anim 
+# custom bootscreen 
+mkdir -p usr/share/library-common
+cp $src_root/../hx_home/*  usr/share/library-common/
+
 echo Setting language 
 cat > home/olpc/.i18n <<EOF
 LANG="es_PE.utf8"
diff --git a/image/xo-1.5.ini b/image/xo-1.5.ini
index 6afa72d..25d4d79 100644
--- a/image/xo-1.5.ini
+++ b/image/xo-1.5.ini
@@ -16,6 +16,17 @@ modules =
 [sd_card_image]
 # 2GB image
 size_1 = 1932735283,zd
+# 4GB image
+#size_1 = 3865470566,zd
 keep_disk_image = 0
 compress_disk_image = 0
 make_zd = 1
+
+[repos]
+fedora_arch = i386
+fedora = fedora,fedora_updates
+olpc_frozen_1 = 1,local.11.3.1
+olpc_frozen_2 = 1,local.11.3.0-xo1.5
+olpc_frozen_3 = 1,local.11.3.1-xo1.5
+add_excludes_to = fedora,fedora-updates,fedora-updates-testing
+
diff --git a/image/xo-1.ini b/image/xo-1.ini
index b09be08..75e527e 100644
--- a/image/xo-1.ini
+++ b/image/xo-1.ini
@@ -12,3 +12,13 @@ modules =
 #   For other OLPC release modules, see sources on
 #   http://git.sugarlabs.org/platform/olpc-os-builder/trees/master/modules
     olpc_11_3_1_xo1
+
+[repos]
+
+fedora_arch = i386
+fedora = fedora,fedora_updates
+olpc_frozen_1 = 1,local.11.3.1
+olpc_frozen_2 = 1,local.11.3.0-xo1
+olpc_frozen_3 = 1,local.11.3.1-xo1
+add_excludes_to = fedora,fedora-updates,fedora-updates-testing
+
diff --git a/post.d/gconf.sh b/post.d/gconf.sh
index 22380ed..2e41364 100644
--- a/post.d/gconf.sh
+++ b/post.d/gconf.sh
@@ -7,3 +7,4 @@ gconf_set --type bool   /desktop/sugar/show_logout false
 gconf_set --type bool   /desktop/sugar/power/automatic true
 gconf_set --type string /desktop/sugar/user/default_nick disabled
 gconf_set --type bool   /desktop/sugar/network/adhoc true
+gconf_set --type string /schemas/desktop/sugar/jabber/server 'jabber.somosazucar.org'