From 0ea24a57a3560f86c17d47f6da731abd81937a09 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 21 Jan 2014 00:29:55 +0100
Subject: [PATCH] gluon-autoupdater: allow configuring the branch name
 independently of the UCI config section name

---
 gluon/gluon-autoupdater/files/etc/config/autoupdater | 3 +++
 gluon/gluon-autoupdater/files/usr/sbin/autoupdater   | 5 +++--
 gluon/gluon-autoupdater/invariant.pl                 | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gluon/gluon-autoupdater/files/etc/config/autoupdater b/gluon/gluon-autoupdater/files/etc/config/autoupdater
index 573f566..b07cf7f 100644
--- a/gluon/gluon-autoupdater/files/etc/config/autoupdater
+++ b/gluon/gluon-autoupdater/files/etc/config/autoupdater
@@ -3,6 +3,9 @@
 #	option branch "stable"
 
 #config branch stable
+	# The branch name given in the manifest
+#	option name 'stable'
+
 #	list mirror 'http://[fdef:ffc0:3dd7::8]/~freifunk/firmware/autoupdate'
 
 	# The updater will run once per hour and perform an update with a certain
diff --git a/gluon/gluon-autoupdater/files/usr/sbin/autoupdater b/gluon/gluon-autoupdater/files/usr/sbin/autoupdater
index 773d67c..5e351b4 100755
--- a/gluon/gluon-autoupdater/files/usr/sbin/autoupdater
+++ b/gluon/gluon-autoupdater/files/usr/sbin/autoupdater
@@ -19,6 +19,7 @@ if test "a$1" != "a-f"; then
   fi
 fi
 
+BRANCH_NAME=$(uci get autoupdater.${BRANCH}.name)
 MIRRORS=$(uci get autoupdater.${BRANCH}.mirror)
 PUBKEYS=$(uci get autoupdater.${BRANCH}.pubkey)
 GOOD_SIGNATURES=$(uci get autoupdater.${BRANCH}.good_signatures)
@@ -83,10 +84,10 @@ verify_manifest() {
 analyse_manifest() {
   local manifest_upper=$1
 
-  grep -q "^BRANCH=${BRANCH}$" $manifest_upper
+  grep -q "^BRANCH=${BRANCH_NAME}$" $manifest_upper
 
   if test $? -ne 0; then
-    echo "Wrong branch. We are on ${BRANCH}" >&2
+    echo "Wrong branch. We are on ${BRANCH_NAME}" >&2
     return 1
   fi
 
diff --git a/gluon/gluon-autoupdater/invariant.pl b/gluon/gluon-autoupdater/invariant.pl
index 493eb29..c6bb3b7 100644
--- a/gluon/gluon-autoupdater/invariant.pl
+++ b/gluon/gluon-autoupdater/invariant.pl
@@ -28,7 +28,7 @@ delete autoupdater.$name
 set autoupdater.$name=branch
 END
 
-  for (qw(probability good_signatures)) {
+  for (qw(name probability good_signatures)) {
     print "set autoupdater.$name.$_=$branch->{$_}\n";
   }