Changes from branching repos into testing and production

5 files changed, 29 insertions, 18 deletions

diff --git a/etc/polkit-1/localauthority/50-local.d/deployment.pkla b/etc/polkit-1/localauthority/50-local.d/deployment.pkla
index 283e1be..94c329b 100644
--- a/etc/polkit-1/localauthority/50-local.d/deployment.pkla
+++ b/etc/polkit-1/localauthority/50-local.d/deployment.pkla
@@ -1,13 +1,20 @@
 [AllowSignedUpdates]
 Identity=*
 Action=org.freedesktop.packagekit.package-install
-ResultAny=no
-ResultInactive=no
+ResultAny=yes
+ResultInactive=yes
 ResultActive=yes
 
 [AllowNotSignedUpdates]
 Identity=*
 Action=org.freedesktop.packagekit.package-install-untrusted
-ResultAny=no
-ResultInactive=no
+ResultAny=yes
+ResultInactive=yes
+ResultActive=yes
+
+[AllowSystemUpdate]
+Identity=*
+Action=org.freedesktop.packagekit.system-update
+ResultAny=yes
+ResultInactive=yes
 ResultActive=yes
diff --git a/etc/sugar/blacklist/deployment b/etc/sugar/blacklist/deployment
deleted file mode 100644
index e3c18d4..0000000
--- a/etc/sugar/blacklist/deployment
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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 5818062..a670b83 100644
--- a/etc/sweets.conf
+++ b/etc/sweets.conf
@@ -2,6 +2,11 @@
 # space separated list of plugins to enable
 plugins = telepathy proxy sn stats
 
+[blacklist]
+# Uncomment it to hide "Plugins" Control Panel section to
+# hanlde plugins configuration only via configuration files
+cpsection = plugins
+
 # Sugar Network client configuration
 # http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Implementation#sugar-network-client
 [client]
@@ -11,6 +16,12 @@ api-url = http://node.sugarlabs.org
 # for now, "pilot" layer is being used to QA most useful/stable activities
 layers = pilot
 
+# the minimal disk free space, in percents, to preserve while recycling disk
+# cache                         
+cache-limit = 10                
+# check disk cache for recycling in specified delay in seconds
+cache-timeout = 3600 
+
 # Default parameters for sugar-plugin-stats package
 [sugar-plugin-stats]
 # space separated list of RRAs for RRD databases to keep usage statistics
@@ -24,4 +35,4 @@ stats-timeout = 3600
 # Default parameters for sugar-plugin-upgrade package
 [sugar-plugin-upgrade]
 # if more than 0, do regular unattended system update with specified delay in seconds
-upgrade-timeout = 0 
+upgrade-timeout = 0
diff --git a/image/common.ini b/image/common.ini
index 63a86f5..6ac405f 100644
--- a/image/common.ini
+++ b/image/common.ini
@@ -50,21 +50,20 @@ path = latestbuild
 # OBS repository on packages.sugarlabs.org with downstream extra packages.
 # This repository will be used to install packages during image building,
 # and, for post-image system upgrades. Repository should be in form of:
-# <OBS_PROJECT>:<OBS_REPOSITORY>
+# <OBS_PROJECT>::<OBS_REPOSITORY>
 deployment_repository = Hexoquinasa:1/SweetsDistribution_0.94_SugarNetwork_Fedora-14
- 
+
 # List of bundle_ids (or Context GUIDs in Sugar Network terms) of activities
 # to prefetch to the 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.vpri.EtoysActivity,
     org.laptop.ImageViewerActivity,
-#org.laptop.sugar.Jukebox,
+    org.laptop.sugar.Jukebox,
     org.laptop.sugar.ReadActivity,
     org.laptop.Terminal,
     org.laptop.TurtleArtActivity,
@@ -87,7 +86,7 @@ offline_activities =
     org.laptop.TurtleArtButia,
     vu.lux.olpc.Speak,
     org.laptop.WikipediaActivity,
-    org.laptop.WikipediaActivityQU,
+#    org.laptop.WikipediaActivityQU,
     mulawa.Sudoku
 
 # List of bundle_ids (or Context GUIDs in Sugar Network terms) of activities
diff --git a/image/latestbuild b/image/latestbuild
index 405e057..6d58c4e 100644
--- a/image/latestbuild
+++ b/image/latestbuild
@@ -1 +1 @@
-127
\ No newline at end of file
+109
\ No newline at end of file