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

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  bce5afacf177a5f2c7271e68bb6abc4b15d7a031 (commit)
       via  dd752529f0c2d226649c68c3b6bfefe47be7fd4f (commit)
      from  27d07446efb51f2e180f5535dd5030222073ec7b (commit)

Summary of changes:
 hotplug/dahdi_handle_device |    2 +-
 hotplug/dahdi_span_config   |    2 +-
 xpp/dahdi_registration      |    2 +-
 xpp/waitfor_xpds            |    4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit bce5afacf177a5f2c7271e68bb6abc4b15d7a031
Author: Aslan Laoz <aslan.laoz at xorcom.com>
Date:   Tue Jan 14 15:34:24 2014 +0000

    waitfor_xpds: handle the case of a failing AB
    
    If an Astribank failed initialization, don't keep waiting for it.

diff --git a/xpp/waitfor_xpds b/xpp/waitfor_xpds
index f1fbd5e..bffa8c2 100755
--- a/xpp/waitfor_xpds
+++ b/xpp/waitfor_xpds
@@ -72,6 +72,10 @@ waitfor_ab_initialization() {
 		fi
 		test "$oldab" != "$ab"
 	do
+		if [ "$ab" = '' ]; then
+			echo >&2 "Astribanks disappeared"
+			break
+		fi
 		oldab="$ab"
 		cat $ab
 		#echo -n 1>&2 "_"

commit dd752529f0c2d226649c68c3b6bfefe47be7fd4f
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Thu Feb 6 18:46:00 2014 +0200

    auto_assign_spans may be true even if not '1'
    
    auto_assign_spans is an int and may have legal values other than 1. It
    is legal (though pointless) to use: modprobe dahdi auto_assign_spans=3.
    Any value != 0 is true.
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
    Acked-by: Russ Meyerriecks <rmeyerriecks at digium.com>

diff --git a/hotplug/dahdi_handle_device b/hotplug/dahdi_handle_device
index 89e2934..52ce9c2 100755
--- a/hotplug/dahdi_handle_device
+++ b/hotplug/dahdi_handle_device
@@ -68,7 +68,7 @@ add)
 		echo "Old driver (no auto_assign_spans parameter). Skip $DEVPATH" | $LOGGER
 		exit 0
 	fi
-	if [ `cat /sys/module/dahdi/parameters/auto_assign_spans` -eq 1 ]; then
+	if [ `cat /sys/module/dahdi/parameters/auto_assign_spans` -ne 0 ]; then
 		echo "auto_assign_spans=1. Skip $DEVPATH" | $LOGGER
 		exit 0
 	fi
diff --git a/hotplug/dahdi_span_config b/hotplug/dahdi_span_config
index 5fce21e..25a10e2 100755
--- a/hotplug/dahdi_span_config
+++ b/hotplug/dahdi_span_config
@@ -71,7 +71,7 @@ add)
 		fi
 	fi
 
-	if [ $(cat /sys/module/dahdi/parameters/auto_assign_spans) -eq 1 ]; then
+	if [ $(cat /sys/module/dahdi/parameters/auto_assign_spans) -ne 0 ]; then
 		$LOGGER "auto_assign_spans=1. Skip $DEVPATH"
 		exit 0
 	fi
diff --git a/xpp/dahdi_registration b/xpp/dahdi_registration
index bd6641e..32bd746 100755
--- a/xpp/dahdi_registration
+++ b/xpp/dahdi_registration
@@ -35,7 +35,7 @@ my %opts;
 getopts('vRs:', \%opts) || usage;
 
 my $dahdi_autoreg = check_param('/sys/module/xpp/parameters/dahdi_autoreg') eq 'Y';
-my $auto_assign_spans = check_param('/sys/module/dahdi/parameters/auto_assign_spans') eq '1';
+my $auto_assign_spans = check_param('/sys/module/dahdi/parameters/auto_assign_spans') ne '0';
 my $assigned_spans_config = $ENV{'ASSIGNED_SPANS_CONF_FILE'} || '/etc/dahdi/assigned-spans.conf';
 my $span_types_config = $ENV{'SPAN_TYPES_CONF_FILE'} || '/etc/dahdi/span-types.conf';
 my $have_assigned_spans_config = -f $assigned_spans_config || 0;

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


-- 
dahdi/tools.git