From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <www-data@comics.unina.it>
Received: from mail-01-ewr.dyndns.com (mxout-113-ewr.mailhop.org
	[216.146.33.113])
	by lists.bufferbloat.net (Postfix) with ESMTP id A31862E36A2
	for <bismark-commits@lists.bufferbloat.net>;
	Fri, 15 Apr 2011 01:17:33 -0700 (PDT)
Received: from scan-01-ewr.mailhop.org (scanner [10.0.141.223])
	by mail-01-ewr.dyndns.com (Postfix) with ESMTP id DB19F1F9B39
	for <bismark-commits@lists.bufferbloat.net>;
	Fri, 15 Apr 2011 08:17:32 +0000 (UTC)
X-Spam-Score: 0.1 ()
X-Mail-Handler: MailHop by DynDNS
X-Originating-IP: 143.225.229.147
Received: from svn.comics.unina.it (unknown [143.225.229.147])
	by mail-01-ewr.dyndns.com (Postfix) with ESMTP id 19EE71F994E
	for <bismark-commits@lists.bufferbloat.net>;
	Fri, 15 Apr 2011 08:17:32 +0000 (UTC)
Received: from www-data by svn.comics.unina.it with local (Exim 4.69)
	(envelope-from <www-data@comics.unina.it>) id 1QAeH8-0002RH-GS
	for bismark-commits@lists.bufferbloat.net;
	Fri, 15 Apr 2011 10:21:10 +0200
To: bismark-commits@lists.bufferbloat.net
From: walter@svn.comics.unina.it
Message-Id: <E1QAeH8-0002RH-GS@svn.comics.unina.it>
Date: Fri, 15 Apr 2011 10:21:10 +0200
Subject: [Bismark-commits] rev 322 - trunk/device/OpenWrt_common/etc
	trunk/device/OpenWrt_common/scripts
X-BeenThere: bismark-commits@lists.bufferbloat.net
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: Commit log for the bismark source code
	<bismark-commits.lists.bufferbloat.net>
List-Unsubscribe: <https://lists.bufferbloat.net/options/bismark-commits>,
	<mailto:bismark-commits-request@lists.bufferbloat.net?subject=unsubscribe>
List-Archive: <https://lists.bufferbloat.net/pipermail/bismark-commits>
List-Post: <mailto:bismark-commits@lists.bufferbloat.net>
List-Help: <mailto:bismark-commits-request@lists.bufferbloat.net?subject=help>
List-Subscribe: <https://lists.bufferbloat.net/listinfo/bismark-commits>,
	<mailto:bismark-commits-request@lists.bufferbloat.net?subject=subscribe>
X-List-Received-Date: Fri, 15 Apr 2011 08:17:34 -0000

Author: walter
Date: 2011-04-15 10:21:10 +0200 (Fri, 15 Apr 2011)
New Revision: 322

Modified:
   trunk/device/OpenWrt_common/etc/bismark.conf
   trunk/device/OpenWrt_common/scripts/bismark-action
   trunk/device/OpenWrt_common/scripts/bismark-bootstrap
   trunk/device/OpenWrt_common/scripts/bismark-probe
   trunk/device/OpenWrt_common/scripts/bismark-rshell
Log:
applied srikanth's fixes

Modified: trunk/device/OpenWrt_common/etc/bismark.conf
===================================================================
--- trunk/device/OpenWrt_common/etc/bismark.conf	2011-04-14 20:06:45 UTC (rev 321)
+++ trunk/device/OpenWrt_common/etc/bismark.conf	2011-04-15 08:21:10 UTC (rev 322)
@@ -17,7 +17,7 @@
 # Device info
 DEVICE_ID=$(cat /etc/bismark/ID)
 PLATFORM=$(uname -nm | tr ' ' '_')
-VERSION=$(svn info $BISMARK_DIR | awk '/^Rev/{ print $2 }')
+VERSION=0
 ZONE=NorthAm
 WAN_IF=eth1
 WIFI_IF=wlan0

Modified: trunk/device/OpenWrt_common/scripts/bismark-action
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-action	2011-04-14 20:06:45 UTC (rev 321)
+++ trunk/device/OpenWrt_common/scripts/bismark-action	2011-04-15 08:21:10 UTC (rev 322)
@@ -10,7 +10,7 @@
 
 # Import configuration and functions
 . /etc/bismark/bismark.conf
-. /lib/bismark/functions.inc.sh
+. /usr/lib/bismark/functions.inc.sh
 
 # Help screen
 [ $1 ] || { echo "$(basename $0) <command> [options]" ; exit ; }

Modified: trunk/device/OpenWrt_common/scripts/bismark-bootstrap
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-bootstrap	2011-04-14 20:06:45 UTC (rev 321)
+++ trunk/device/OpenWrt_common/scripts/bismark-bootstrap	2011-04-15 08:21:10 UTC (rev 322)
@@ -17,5 +17,5 @@
 # bismark-event modem
 
 # Cronjobs setup
-cat /etc/crontabs/root /etc/bismark/crontab | crontab -
+cat /etc/crontabs/root /etc/bismark/crontab | sort -u | crontab -
 

Modified: trunk/device/OpenWrt_common/scripts/bismark-probe
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-probe	2011-04-14 20:06:45 UTC (rev 321)
+++ trunk/device/OpenWrt_common/scripts/bismark-probe	2011-04-15 08:21:10 UTC (rev 322)
@@ -9,7 +9,7 @@
 
 # Load configuration file
 . /etc/bismark/bismark.conf
-. /lib/bismark/functions.inc.sh
+. /usr/lib/bismark/functions.inc.sh
 
 # Local config
 MAX_SLEEP=30
@@ -55,5 +55,5 @@
 
 # Parse reply
 read cmd value < /tmp/bismark/var/reply
-[ $cmd ] && REMOTE=on action $cmd $value
+[ $cmd ] && REMOTE=on bismark-action $cmd $value
 

Modified: trunk/device/OpenWrt_common/scripts/bismark-rshell
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-rshell	2011-04-14 20:06:45 UTC (rev 321)
+++ trunk/device/OpenWrt_common/scripts/bismark-rshell	2011-04-15 08:21:10 UTC (rev 322)
@@ -5,7 +5,7 @@
 
 # Load configuration file
 . /etc/bismark/bismark.conf
-. /lib/bismark/functions.inc.sh
+. /usr/lib/bismark/functions.inc.sh
 
 # Local config
 BASE_PORT=5000