Fix XPP_HOTPLUG_DAHDI: logic; end of init.d script

'Hotplug mode' was introduced in r7335.

* The logic in the script was broken.
  - Negative logic is not such a grand idea to start with.
* Interactive invocation of init.d ends when expected and not sooner.

This change makes waitfor_xpds wait longer. Rather than waiting for all
the Astribanks to load, it will now wait until the initialization of
dahdi from the Astribanks hook script is run.

This allows running e.g.: /etc/init.d/dahdi start; /etc/init.d/asterisk start

It also means that 'astribank_is_starting' is actually used as a
semaphore and not only as stamp file.
 
As before, those changes have no effect if hotplug mode is not
explicitly enabled (setting 'XPP_HOTPLUG_DAHDI=yes' in init.conf).



git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@7409 a0bf4364-ded3-4de4-8d8a-66a801d63aff

1 files changed, 24 insertions, 2 deletions

diff --git a/xpp/astribank_is_starting.8 b/xpp/astribank_is_starting.8
index 205e498..55db6f6 100644
--- a/xpp/astribank_is_starting.8
+++ b/xpp/astribank_is_starting.8
@@ -3,9 +3,9 @@
 .SH NAME
 astribank_is_starting \- Mark / check is a Xorcom Astribank (xpp) is starting
 .SH SYNOPSIS
-.B astribank_is_starting [-d] <-a|-r>
+.B astribank_is_starting [-d] [-v] [-t \fItimeout\fB] <-a|-r|-w>
 
-.B astribank_is_starting [-d]
+.B astribank_is_starting [-d] [-v]
 
 .B astribank_is_starting -h
 
@@ -29,11 +29,28 @@ Set the mark. Should return 0 unless there's an error.
 Reset the mark. Should return 0 unless there's an error.
 .RE
 
+.BI -t timeout
+.RS
+.B Timeout.
+Set the timeout value for the \fB-w\fR option. Default is 60 seconds.
+.RE
+
+.B -w
+.RS
+.B Wait.
+Wait for mark to be reset. Should return 0 unless there's an error.
+.RE
+
 Without -a or -r: return 0 if the mark has been set, or a non-zero value
 otherwise.
 
 .B -d
 .RS
+Print debug information to stderr.
+.RE
+
+.B -v
+.RS
 Verbose execution.
 .RE
 
@@ -65,6 +82,11 @@ Q: Why do you use a semaphore?
 
 A: because, unlike the filesystem, it is writable at any given time.
 
+.SH BUGS
+Option ordering matter. The \fB-v\fR and \fB-d\fR options should preceed
+the actions (\fB-a\fR, \fB-r\fR and \fB-w\fR).
+The \fB-t\fItimeout\fR option should preceed the \fB-w\fR option.
+
 .SH SEE ALSO
 semctl(3)