diff options
| author | Daniel Drake <dsd@laptop.org> | 2010-05-14 12:51:01 (GMT) |
|---|---|---|
| committer | Daniel Drake <dan@reactivated.net> | 2010-05-14 12:51:01 (GMT) |
| commit | fb74bbaf81fe2d095fbadefaea218fdb740e93f2 (patch) | |
| tree | a7238f9c2b13100e889986aac9c5eaafb55cbffb /modules | |
| parent | d797610c91bf347447e1ab3c849d890a9f02bec0 (diff) | |
sugar_activity_group: configure activity group as systemwide by default
Otherwise you can't change the activity group in an incremental OS
update, which is potentially asking for trouble in the field.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/sugar_activity_group/README | 10 | ||||
| -rw-r--r-- | modules/sugar_activity_group/defaults.ini | 1 | ||||
| -rw-r--r-- | modules/sugar_activity_group/kspost.60.nochroot.activities.py | 10 |
3 files changed, 19 insertions, 2 deletions
diff --git a/modules/sugar_activity_group/README b/modules/sugar_activity_group/README index d2c3021..30a3494 100644 --- a/modules/sugar_activity_group/README +++ b/modules/sugar_activity_group/README @@ -20,3 +20,13 @@ installed. e.g.: url=http://wiki.laptop.org/go/Activities/G1G1 install_activities=0 + +By default, the activity group will be written to the system-wide configuration file /etc/olpc-update/activity-groups. The activity_group_systemwide option +can be disabled in order to use the /home/olpc/Activities/.groups location +instead (note that this file resides outside of the OS, so cannot be updated +with an OS update). e.g.: + +[sugar_activity_group] +url=http://wiki.laptop.org/go/Activities/G1G1 +activity_group_systemwide=0 + diff --git a/modules/sugar_activity_group/defaults.ini b/modules/sugar_activity_group/defaults.ini index 267189b..9a3d76e 100644 --- a/modules/sugar_activity_group/defaults.ini +++ b/modules/sugar_activity_group/defaults.ini @@ -1,3 +1,4 @@ [sugar_activity_group] install_activities=1 +activity_group_systemwide=1 diff --git a/modules/sugar_activity_group/kspost.60.nochroot.activities.py b/modules/sugar_activity_group/kspost.60.nochroot.activities.py index 4918148..f3e32d7 100644 --- a/modules/sugar_activity_group/kspost.60.nochroot.activities.py +++ b/modules/sugar_activity_group/kspost.60.nochroot.activities.py @@ -172,6 +172,8 @@ if not os.path.exists(cache): baseurl = ooblib.read_config('sugar_activity_group', 'url') install_activities = ooblib.read_config_bool('sugar_activity_group', 'install_activities') +systemwide = ooblib.read_config_bool('sugar_activity_group', + 'activity_group_systemwide') if install_activities: vmaj = int(ooblib.read_config('global', 'olpc_version_major')) @@ -226,6 +228,10 @@ if install_activities: # only process the first working URL break -print "echo '%s' > $INSTALL_ROOT/home/olpc/Activities/.groups" % baseurl -print "chown -R 500:500 $INSTALL_ROOT/home/olpc/{Activities,Library}" +if systemwide: + print "mkdir -p $INSTALL_ROOT/etc/olpc-update" + print "echo '%s' > $INSTALL_ROOT/etc/olpc-update/activity-groups" % baseurl +else: + print "echo '%s' > $INSTALL_ROOT/home/olpc/Activities/.groups" % baseurl + print "chown -R 500:500 $INSTALL_ROOT/home/olpc/{Activities,Library}" |