dahdi.init: call xpp_sync a bit later.

xpp_sync needs to only be called after dahdi_cfg was run, because the
application of system.conf may change the priority of a PRI module span
(If it is a sync provider, "NT", priority is lower).

Also some documentation-only changes for xpp_sync.


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

3 files changed, 29 insertions, 3 deletions

diff --git a/dahdi.init b/dahdi.init
index 4538901..6ae1e3d 100755
--- a/dahdi.init
+++ b/dahdi.init
@@ -97,9 +97,6 @@ xpp_startup() {
 	# when locales are missing.
 	# No register all the devices if they didn't auto-register:
 	LC_ALL=C dahdi_registration on
-
-	# this one could actually be run after dahdi_cfg:
-	LC_ALL=C xpp_sync "$XPP_SYNC"
 }
 
 
@@ -223,6 +220,9 @@ case "$1" in
 		$FXOTUNE -s || :
 	fi
 
+	# Set the right Astribanks ticker:
+	LC_ALL=C xpp_sync "$XPP_SYNC"
+
 	hpec_start
 	;;
   stop)
diff --git a/xpp/README.Astribank b/xpp/README.Astribank
index fc3d4df..05c8a74 100644
--- a/xpp/README.Astribank
+++ b/xpp/README.Astribank
@@ -1112,6 +1112,19 @@ parameter <<_zap_autoreg>> in the modprobe configuration file (A file under
   options xpp zap_autoreg=1
 
 
+Astribanks Synchronization Source
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+If there is more than one Astribank on the system, all the Astribanks
+keep their clock in sync. Optionally the Astribanks can synchronize
+their clock to the master DAHDI device (in case it is a different DAHDI
+device). Normally you just use the default init.d script or run
+explicitly:
+
+  xpp_sync auto
+
+(For now see the man page of xpp_sync for more information)
+
+
 DAHDI And Above
 ^^^^^^^^^^^^^^^
 From here you get a standard DAHDI span. The next step is to configure
diff --git a/xpp/xpp_sync b/xpp/xpp_sync
index 8d85739..e62169a 100755
--- a/xpp/xpp_sync
+++ b/xpp/xpp_sync
@@ -200,14 +200,27 @@ The parameter it is called with defaults to
 I<auto>, but it is possible to override that parameter (e.g: set it to
 I<dahdi>) through the value of XPP_SYNC in /etc/dahdi/init.conf .
 
+It should be run after dahdi_cfg as the configuration of a PRI module
+is set from it. It must be run after dahdi_registration as it only
+handles XPDs that are registered spans.
+
 =head1 FILES
 
 =over
 
+=item /sys/bus/astribanks/drivers/xppdrv/sync
+
+The low-level interface used by xpp_sync to set / read registration.
+
 =item /proc/xpp/sync
 
+(Deprecated: no longer supported)
 xpp_sync is essentially a nicer interface to /proc/xpp/sync . That file
 shows the current xpp sync master (and in what format you need to write
 to it to set the master).
 
+=head1 SEE ALSO
+
+dahdi_registration(1), dahdi_cfg(1), README.Astribank
+
 =back