[dahdi-commits] tzafrir: branch tools/tzafrir/sysfs r8757 - /tools/team/tzafrir/sysfs/xpp/

[SVN commits to the DAHDI project]

Author: tzafrir
Date: Tue Jun  8 10:32:24 2010
New Revision: 8757

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8757
Log:
install span_symlink; live-init.conf

* Do install span_symlink (used in udev hook)
* Create live/usr/share/dahdi/live-init.conf for hooks to pass config
  to that script when run from udev.

Modified:
    tools/team/tzafrir/sysfs/xpp/Makefile
    tools/team/tzafrir/sysfs/xpp/symlink_span

Modified: tools/team/tzafrir/sysfs/xpp/Makefile
URL: http://svnview.digium.com/svn/dahdi/tools/team/tzafrir/sysfs/xpp/Makefile?view=diff&rev=8757&r1=8756&r2=8757
==============================================================================
--- tools/team/tzafrir/sysfs/xpp/Makefile (original)
+++ tools/team/tzafrir/sysfs/xpp/Makefile Tue Jun  8 10:32:24 2010
@@ -83,7 +83,7 @@
 	$(INSTALL) -d $(DESTDIR)$(SBINDIR)
 	$(INSTALL) $(PROG_INSTALL) $(DESTDIR)$(SBINDIR)/
 	$(INSTALL) -d $(DESTDIR)$(DATADIR)
-	$(INSTALL) xpp_fxloader astribank_hook $(DESTDIR)$(DATADIR)/
+	$(INSTALL) xpp_fxloader astribank_hook symlink_span $(DESTDIR)$(DATADIR)/
 	$(INSTALL) waitfor_xpds $(DESTDIR)$(DATADIR)/
 	$(INSTALL) -d $(DESTDIR)$(MANDIR)
 	$(INSTALL_DATA) $(MAN_INSTALL) $(DESTDIR)$(MANDIR)/

Modified: tools/team/tzafrir/sysfs/xpp/symlink_span
URL: http://svnview.digium.com/svn/dahdi/tools/team/tzafrir/sysfs/xpp/symlink_span?view=diff&rev=8757&r1=8756&r2=8757
==============================================================================
--- tools/team/tzafrir/sysfs/xpp/symlink_span (original)
+++ tools/team/tzafrir/sysfs/xpp/symlink_span Tue Jun  8 10:32:24 2010
@@ -25,6 +25,11 @@
 
 # Our directory in the beginning, so we can use local lab setup
 PATH="$dir:/usr/sbin:/sbin:/usr/bin:/bin"
+my_dir=`dirname $0`
+
+if [ -r "$my_dir/live-init.conf" ]; then
+	. "$my_dir/live-init.conf" 
+fi
 
 set -e
 
@@ -53,7 +58,6 @@
 
 dahdiconfdir=${dahdiconfdir:-/etc/dahdi}
 export dahdiconfdir
-dahdiconfdir=/tmp/xortel/dahdi
 initfile="$dahdiconfdir/init.conf"
 
 [ -r "$initfile" ] && . "$initfile"