Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/modules/oats_cfg
diff options
context:
space:
mode:
authorMartin Langhoff <martin@laptop.org>2011-02-18 17:23:32 (GMT)
committer Daniel Drake <dsd@laptop.org>2011-02-20 17:19:54 (GMT)
commitc0ffc8ec148d0cccd2f60518d10476d084fbac61 (patch)
treefcd18217725dd2c0c49abc3b03b1335c3fbc3afe /modules/oats_cfg
parentb3f09ed40d42a5116a14c46c6e51a97cf28adada (diff)
oats_cfg: add support for setting the stream
Useful in deployments handling different unit models, or different OS builds.
Diffstat (limited to 'modules/oats_cfg')
-rw-r--r--modules/oats_cfg/README5
-rw-r--r--modules/oats_cfg/kspost.50.oats_cfg.sh4
2 files changed, 8 insertions, 1 deletions
diff --git a/modules/oats_cfg/README b/modules/oats_cfg/README
index 03461be..50bc2ef 100644
--- a/modules/oats_cfg/README
+++ b/modules/oats_cfg/README
@@ -1,7 +1,7 @@
This module allows you to configure an OATS server used by olpc-update,
overriding the default of antitheft.laptop.org
-It has 2 options:
+Options:
server: the address of an OATS server to use
@@ -11,9 +11,12 @@ to override this behaviour, the school server will not be tried. Useful in
deployments with good connectivity where antitheft is controlled in a central
location (as opposed to the specific school).
+stream: the update stream - this is helpful when deploying different OS images
+that query the same update server.
Example configuration:
[oats_cfg]
server=my-oats-server.mydeployment.com
ignore_xs=1
+stream=xo15hs
diff --git a/modules/oats_cfg/kspost.50.oats_cfg.sh b/modules/oats_cfg/kspost.50.oats_cfg.sh
index 924910e..dcf0ae7 100644
--- a/modules/oats_cfg/kspost.50.oats_cfg.sh
+++ b/modules/oats_cfg/kspost.50.oats_cfg.sh
@@ -14,3 +14,7 @@ if [ -n "$server" ]; then
echo "echo '$server' > /etc/oats-server"
fi
+if [ -n "$stream" ]; then
+ echo "echo '$stream' > /etc/update-stream"
+fi
+