[Bismark-commits] rev 322 - trunk/device/OpenWrt_common/etc trunk/device/OpenWrt_common/scripts

[Bismark-commits] rev 322 - trunk/device/OpenWrt_common/etc trunk/device/OpenWrt_common/scripts

[walter]

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