[SCM] TANGO distributed control system. branch, master, updated. debian/6.1.1c-1-123-gcac4581

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit cac4581a06e9b345c61f1a630c51cb584c42e3a2
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Wed Feb 16 09:54:01 2011 +0100

    * update the init script for computer without external network.

diff --git a/debian/changelog b/debian/changelog
index d24629f..8aa4df5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-tango (7.2.2+dfsg-1) unstable; urgency=low
+tango (7.2.5+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #400201)
 
- -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>  Fri, 08 Oct 2010 13:49:43 +0200
+ -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>  Wed, 16 Feb 2010 08:49:43 +0200
diff --git a/debian/rules b/debian/rules
index 21f46c6..ab15103 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,6 +39,11 @@ override_dh_strip:
 	dh_strip -ptango-test --dbg-package=tango-test-dbg
 	dh_strip -a -Nlibtango7 -Nliblog4tango4 -Ntango-db -Ntango-starter -Ntango-accesscontrol -Ntango-test
 
+override_dh_installinit:
+	# the tango-accesscontrol device must be started after the tango-db.
+	dh_installinit -ptango-accesscontrol --update-rcd-params="defaults 25"
+	dh_installinit -a -Ntango-accesscontrol
+
 %:
 	dh $@ --builddirectory=$(BUILDROOT)
 
diff --git a/debian/tango-accesscontrol.init.d b/debian/tango-accesscontrol.init.d
index b91a3d2..5dac46f 100644
--- a/debian/tango-accesscontrol.init.d
+++ b/debian/tango-accesscontrol.init.d
@@ -18,6 +18,8 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/tango
 DESC="Tango Control System - accesscontrol"
 NAME=tango-accesscontrol
 NAME_REAL=TangoAccessControl
+CONFFILE=/etc/tangorc
+CANON_HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
 DAEMON=/usr/lib/tango/$NAME_REAL
 DAEMON_ARGS="1"
 PIDFILE=/var/run/$NAME.pid
@@ -43,11 +45,10 @@ do_start()
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
-
-	# to start this daemon need a working network and a working database
-	# the database can be on another computer so we need to check that
-	# it was already started.
-	tango_admin --ping-network 4 || return 2
+	if [ $CANON_HOST != "localhost" ]
+	then
+		tango_admin --ping-network 4 || return 2
+	fi
 	tango_admin --ping-database 6 || return 2
 	start-stop-daemon --start --quiet --chuid tango:tango --background \
 	    --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
diff --git a/debian/tango-db.init.d b/debian/tango-db.init.d
index c6fa558..9d0a71f 100644
--- a/debian/tango-db.init.d
+++ b/debian/tango-db.init.d
@@ -55,7 +55,7 @@ do_start()
 		DAEMON_ARGS="2 -ORBendPoint giop:tcp:$HOST:$PORT"
 	else
 		DAEMON_ARGS="2 -ORBendPoint giop:tcp::$PORT"
-		tango_admin --ping-network 45 || return 2
+		tango_admin --ping-network 40 || return 2
 	fi
 	start-stop-daemon --start --quiet --chuid tango:tango --background \
 	    --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
diff --git a/debian/tango-starter.init.d b/debian/tango-starter.init.d
index 3006453..964b492 100644
--- a/debian/tango-starter.init.d
+++ b/debian/tango-starter.init.d
@@ -18,6 +18,8 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/tango
 DESC="Tango Control System - starter"
 NAME=tango-starter
 NAME_REAL=Starter
+CONFFILE=/etc/tangorc
+CANON_HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
 DAEMON=/usr/lib/tango/$NAME_REAL
 DAEMON_ARGS=`hostname`
 PIDFILE=/var/run/$NAME.pid
@@ -44,8 +46,11 @@ do_start()
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
 
-	# first check for a running network and tango-database
-	tango_admin --ping-network 4 || return 2
+	# first check for a running tango-database and
+	if [ $CANON_HOST != "localhost" ]
+	then
+		tango_admin --ping-network 40 || return 2
+	fi
 	tango_admin --ping-database 6 || return 2
 	# register the tango-starter if necessary
 	tango_admin --check-device tango/admin/`hostname` || tango_admin --add-server Starter/`hostname` Starter tango/admin/`hostname` || return 2

-- 
TANGO distributed control system.