[Pkg-voip-commits] [dahdi-tools] 180/285: auto_assign_spans may be true even if not '1'

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository dahdi-tools.

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>
---
 hotplug/dahdi_handle_device | 2 +-
 hotplug/dahdi_span_config   | 2 +-
 xpp/dahdi_registration      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-tools.git