diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2010-03-18 12:38:53 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2010-03-18 12:38:53 +0000 |
| commit | 2745eff6ce058f8f367b013861b0e43298f7a98a (patch) | |
| tree | 8df0e0f1272506f6838baca1b9327c88e0daf8b9 | |
| parent | 0a947376611242fdd61913c24728566d0fa05593 (diff) | |
live_dahdi: fixes for rsync mode
* Run programs from live tree rather than tools dir (not copied)
* Calculate MODULES dir after reading config file (you'll still need to
override it from the command line for building, but not for reload)
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8347 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rwxr-xr-x | build_tools/live_dahdi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build_tools/live_dahdi b/build_tools/live_dahdi index 640f893..2fcd17b 100755 --- a/build_tools/live_dahdi +++ b/build_tools/live_dahdi @@ -4,7 +4,6 @@ LINUX_DIR=${LINUX_DIR:=.} TOOLS_DIR=${TOOLS_DIR:=../dahdi-tools} DESTDIR=$PWD/live KVERS=${KVERS:-`uname -r`} -MODULES_DIR="$DESTDIR/lib/modules/$KVERS/dahdi" XPP_SYNC=${XPP_SYNC:-auto} AST_SCRIPT=${AST_SCRIPT:-/etc/init.d/asterisk} # Use this file to pass options to modules: @@ -22,6 +21,7 @@ REMOVE_MODULES="${REMOVE_MODULES:-dahdi}" # "dahdi oslec"? if [ -r $DESTDIR/live.conf ]; then . $DESTDIR/live.conf; fi +MODULES_DIR="$DESTDIR/lib/modules/$KVERS/dahdi" if [ ! -d "$LINUX_DIR" ]; then echo >&2 "$0:dahdi-linux dir '$LINUX_DIR' does not exits. Aborting". exit 1 @@ -106,7 +106,7 @@ xpp_startup() { if ! grep -q connected /proc/xpp/xbuses 2>/dev/null; then return 0; fi echo "Waiting for Astribank devices to initialize:" - $TOOLS_DIR_FULL/xpp/waitfor_xpds # Asusmes a recent dahdi-tools + "$FIRMWARE_DIR/waitfor_xpds" # Asusmes a recent dahdi-tools # overriding locales for the above two, as perl can be noisy # when locales are missing. @@ -235,10 +235,10 @@ xpp-firm) # Still broken. Needs to be run several times. # set XPP_HOTPLUG_DISABLED=yes in /etc/dahdi/init.conf XPP_FIRMWARE_DIR=$FIRMWARE_DIR \ - sh "$TOOLS_DIR"/xpp/xpp_fxloader reset + "$FIRMWARE_DIR/xpp_fxloader" reset sleep 5 XPP_FIRMWARE_DIR=$FIRMWARE_DIR \ - sh "$TOOLS_DIR"/xpp/xpp_fxloader load + "$FIRMWARE_DIR/xpp_fxloader" load ;; help|'') usage |