[svn-commits] tzafrir: branch tools/tzafrir/sysfs r8974 - /tools/team/tzafrir/sysfs/xpp/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Sat Jul 24 08:01:35 2010
New Revision: 8974

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8974
Log:
live_dahdi: fix generation of symlinks

* If we use udev hooks for a "live" dahdi test-install, make sure you run
  binaries from the sbin directory under live/ .
* Propagate changes of location of configuration directory as well.

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

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=8974&r1=8973&r2=8974
==============================================================================
--- tools/team/tzafrir/sysfs/xpp/symlink_span (original)
+++ tools/team/tzafrir/sysfs/xpp/symlink_span Sat Jul 24 08:01:35 2010
@@ -64,7 +64,7 @@
 
 SPAN_NAMES="/dev/dahdi/span-names"
 SPAN_ALIASES="/dev/dahdi/span-aliases"
-DAHDI_ALIASES=${DAHDI_ALIASES:-/usr/sbin/dahdi_aliases}
+DAHDI_ALIASES=${DAHDI_ALIASES:-dahdi_aliases}
 REAL_SPAN_NUM=`echo $DEVPATH | sed 's/^.*-//'`
 LINK_DEST="/dev/dahdi/spans/${REAL_SPAN_NUM}"
 
@@ -108,7 +108,7 @@
 
 case "$ACTION" in
 add)
-	if [ ! -d "$SPAN_ALIASES" -a -x "$DAHDI_ALIASES" ]; then
+	if [ ! -d "$SPAN_ALIASES" -a -x "`which $DAHDI_ALIASES 2>/dev/null`" ]; then
 		"$DAHDI_ALIASES" create 2>&1 | $LOGGER
 	fi
 	create_links 2>&1 | $LOGGER