xpp.r4415: (from 1.2 r2811)

  * Show Astribank 6+2 as 6/2 channels and not 8/8 channels.
    - Added as a "subtype" to the device type (r4391).
  * Fixed a panic in BRI span shutdown method (r4393).
  * Changes to debug macros.
  * Add proper sysfs support (r4406)
    - A bus on whuch all of the Astribanks reside.
    - Replaces useless sysfs code that existed in the module.
    - Currently used to set the sync source automatically at device
      adition / removal.
  * BRI: We do need the T1 timer in NT. If it gets into G2 state (r4407).

Merged revisions 2812 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

........

* Ignore generated files on the new wctdm24xxp dir. (from 1.2 r2796)
* Ignore two extra man pages on xpp/utils .

Merged revisions 2797 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

........

* Generate list of Zaptel Modules directories automatically.
* Evaluate PERLLIBDIR only once.

Closes: #10223 (Xorcom changeset:4379, from 1.2 r2758)

Merged revisions 2759 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2814 5390a7c7-147a-4af0-8ec9-7488f05a26cb

4 files changed, 57 insertions, 3 deletions

diff --git a/xpp/utils/Makefile b/xpp/utils/Makefile
index 72ba74d..7500246 100644
--- a/xpp/utils/Makefile
+++ b/xpp/utils/Makefile
@@ -23,8 +23,8 @@ DATADIR		= $(datadir)/zaptel
 MANDIR		= $(mandir)/man8
 HOTPLUG_USB_DIR	= /etc/hotplug/usb
 UDEV_RULES_DIR	= /etc/udev/rules.d
-PERLLIBDIR	= $(shell eval `perl -V:sitelib`; echo "$$sitelib")
-PERL_DIRS	:= Zaptel Zaptel/Hardware Zaptel/Xpp
+PERLLIBDIR	:= $(shell eval `perl -V:sitelib`; echo "$$sitelib")
+PERL_DIRS	:= $(shell cd zconf; find * -name '[A-Z]*' -type d| xargs)
 PERL_MODS_PAT	:= *.pm $(PERL_DIRS:%=%/*.pm)
 PERL_MODS	:= $(shell cd zconf; echo $(PERL_MODS_PAT))
 
@@ -82,6 +82,7 @@ install: all
 	$(INSTALL) -d $(DESTDIR)$(DATADIR)
 	$(INSTALL_DATA) $(XPD_INIT_DATA) $(DESTDIR)$(DATADIR)/
 	$(INSTALL) $(XPD_INIT) $(DESTDIR)$(DATADIR)/
+	$(INSTALL) astribank_hook $(DESTDIR)$(DATADIR)/
 	$(INSTALL) -d $(DESTDIR)$(MANDIR)
 	$(INSTALL_DATA) $(MAN_INSTALL) $(DESTDIR)$(MANDIR)/
 	$(INSTALL) -d $(DESTDIR)$(HOTPLUG_USB_DIR)
diff --git a/xpp/utils/astribank_hook b/xpp/utils/astribank_hook
new file mode 100755
index 0000000..53d42f9
--- /dev/null
+++ b/xpp/utils/astribank_hook
@@ -0,0 +1,47 @@
+#! /bin/sh
+
+set -e
+
+xpp_sync="/root/xortel/xpp_sync"
+
+me=`basename $0`
+INIT_DIR=`dirname $0`
+XPP_BASE=/proc/xpp
+export XPP_BASE
+LOGGER="logger -s -t $me"
+
+ZAPTEL_BOOT_DEBIAN=${ZAPTEL_BOOT_DEBIAN:-/etc/default/zaptel}
+ZAPTEL_BOOT_FEDORA=${ZAPTEL_BOOT_FEDORA:-/etc/sysconfig/zaptel}
+
+# read default configuration from /etc/default/zaptel
+if [ -r $ZAPTEL_BOOT_DEBIAN ]; then . $ZAPTEL_BOOT_DEBIAN; fi
+if [ -r $ZAPTEL_BOOT_FEDORA ]; then . $ZAPTEL_BOOT_FEDORA; fi
+
+if [ "$ASTRIBANK_HOOK_DISABLED" != '' ]; then
+	$LOGGER -p kern.info "Exiting... ASTRIBANK_HOOK_DISABLED"
+	exit 0
+fi
+
+# Always redirect stderr somewhere, otherwise the shell script will die
+# when it tries to do I/O related stuff on closed file descriptor.
+# Our default is to throw it down the bit-bucket.
+#exec 2> /dev/console
+## If you wish to trace this script:
+#exec 2> "/tmp/astribank_hook_$XBUS_NAME"
+
+$LOGGER -p kern.info "$ACTION: $*"
+
+$LOGGER -p kern.info "Change Sync"
+
+case "$ACTION" in
+add)
+	"$xpp_sync" auto
+	;;
+remove)
+	"$xpp_sync" auto
+	;;
+*)
+	;;
+esac
+
+"$xpp_sync" | $LOGGER -p kern.info
diff --git a/xpp/utils/xpp.rules b/xpp/utils/xpp.rules
index a20acff..794a9f0 100644
--- a/xpp/utils/xpp.rules
+++ b/xpp/utils/xpp.rules
@@ -8,3 +8,6 @@ SYSFS{idVendor}=="e4e4", SYSFS{idProduct}=="11[345][01]", \
 
 LABEL="xpp_usb_add_end"
 
+# Hotplug hook for Astribank up/down
+KERNEL=="xbus*" RUN+="/usr/share/zaptel/astribank_hook udev $kernel $sysfs{status} $sysfs{connector}"
+
diff --git a/xpp/utils/xpp_fxloader b/xpp/utils/xpp_fxloader
index 5584b5f..3000718 100644
--- a/xpp/utils/xpp_fxloader
+++ b/xpp/utils/xpp_fxloader
@@ -215,7 +215,10 @@ esac
 ##
 
 # allow disabling automatic hotplugging:
-if [ "$XPP_HOTPLUG_DISABLED" != '' ]; then exit 0; fi
+if [ "$XPP_HOTPLUG_DISABLED" != '' ]; then
+	$LOGGER -p kern.info "Exiting... XPP_HOTPLUG_DISABLED"
+	exit 0
+fi
 
 if [ "$ACTION" = "add" ] && [ -w "$DEVICE" ]
 then