[dahdi-commits] dahdi/tools.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  e553ffde2b2337ce0fe4adbb38f047cac6a8b80e (commit)
       via  d1fb614ac850b89344e9fc0949ee4774e8b85b0f (commit)
      from  98ecc272d18e8172ee4b81a58cda9d8d0d850736 (commit)

Summary of changes:
 README                            |    7 +++++--
 hotplug/span_config.d/50-asterisk |    5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit e553ffde2b2337ce0fe4adbb38f047cac6a8b80e
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Tue Jan 28 11:42:33 2014 +0200

    README: udev hooks run scripts from directories
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/README b/README
index a8b593e..2fadf61 100644
--- a/README
+++ b/README
@@ -264,7 +264,8 @@ to user space. Those events are normally handled by udevd. Configurations
 for udevd ("udev rules") may be placed in /etc/udev/rules.d or
 /lib/udev/rules.d. This package installs rules that instruct udevd to
 run the script `/usr/share/dahdi/dahdi_handle_device` on each new
-device. This script will:
+device, which runs all the scripts in `/usr/share/dahdi/handle_device.d`.
+Those scripts will:
 
 * If `/etc/dahdi/span-types.conf` exists, apply it to the device. It is
  used for E1/T1/J1 settings. See
@@ -298,12 +299,14 @@ listed under its device. As a new kernel object was created, an event is
 sent to udev.
 
 The standard DAHDI udev rules instruct udevd to run the script
-`/usr/share/dahdi/dahdi_span_config`. This script configures the new
+`/usr/share/dahdi/dahdi_span_config` which runs all the scripts in
+`/usr/share/dahdi/span_config.d`. Those script configures the new
 span:
 
 * If system.conf does not exist, generates a temporary configuration
   for the span using link:doc/dahdi_genconf.8.html[dahdi_genconf
   system].
+
 * Runs link:doc/dahdi_cfg.8.html[dahdi_cfg] on the new span (using `-S`
   and -C`).
 

commit d1fb614ac850b89344e9fc0949ee4774e8b85b0f
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Tue Jan 28 11:32:31 2014 +0200

    hotplug: document asterisk scriptlet
    
    A well-behaving distribution may choose not to install
    span_config.d/50-asterisk as part of dahdi-tools, as it belongs in
    asterisk. Still, it would be nice to be able to keep it as a documented
    usage example. So just writ where this file needs to go and what it
    does.
    
    No other change: it is still installed by default.
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/hotplug/span_config.d/50-asterisk b/hotplug/span_config.d/50-asterisk
index 2e7adbd..3b75899 100755
--- a/hotplug/span_config.d/50-asterisk
+++ b/hotplug/span_config.d/50-asterisk
@@ -1,5 +1,10 @@
 #! /bin/sh
 
+# This file, if installed under /usr/share/dahdi/span_config.d/ , will
+# attempt to add a newly-generated span to a running copy of Asterisk.
+# Asterisk has to be running (if not: it will pick the span on its
+# startup), and has to have the channels already configured.
+
 if [ "$ACTION" != 'add' ]; then
 	# Nothing to do here
 	exit 0

-----------------------------------------------------------------------


-- 
dahdi/tools.git