summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README8
-rwxr-xr-xdahdi.init1
-rw-r--r--init.conf.sample29
3 files changed, 4 insertions, 34 deletions
diff --git a/README b/README
index b18891f..fb0aa0f 100644
--- a/README
+++ b/README
@@ -296,10 +296,10 @@ DAHDI PERL modules
-------------------
The directory xpp has, in addition to helper utilities for the
Xorcom Astribank, a collection of perl modules to provide information
-related to DAHDI. The perl modules themselves are under xpp/perl_modules .
-In xpp there are several utilities that use those modules:
-- xpp-specific:dahdi_registration, xpp_sync, xpp_blink .
-- General: lsdahdi, dahdi_genconf, dahdi_hardware
+related to DAHDI. The perl modules themselves are under xpp/perl_modules/ .
+In xpp/ there are several utilities that use those modules:
+- xpp-specific: dahdi_registration, xpp_sync, xpp_blink .
+- General: lsdahdi, dahdi_genconf, dahdi_hardware, dahdi_drivers
The DAHDI perl modules will currently only be automatically installed if you
happen to install the xpp directory. Those utilities require the perl modules
diff --git a/dahdi.init b/dahdi.init
index f68af1b..0f4b705 100755
--- a/dahdi.init
+++ b/dahdi.init
@@ -148,7 +148,6 @@ RETVAL=0
# See how we were called.
case "$1" in
start)
- MODULES=""
cat "/etc/dahdi/modules" | grep "^[^\#]" | {
foundone=false
echo -ne $"Loading DAHDI hardware modules:\n"
diff --git a/init.conf.sample b/init.conf.sample
index bd019ef..78ca86e 100644
--- a/init.conf.sample
+++ b/init.conf.sample
@@ -11,32 +11,3 @@
# Override settings for xpp_fxloader
#XPP_FIRMWARE_DIR=/usr/share/dahdi
#XPP_HOTPLUG_DISABLED=yes
-
-# Modules configuration was in this file in Zaptel. In DAHDI it was
-# moved to /etc/dahdi/modules . Refer to Refer to modules.sample .
-
-# By default, DAHDI will not load any modules. Please uncomment the
-# as per your requirements; modules to load/unload
-#Module Name Hardware
-#MODULES="$MODULES wct4xxp" # TE405P - Quad Span T1/E1 Card (5v version)
- # TE410P - Quad Span T1/E1 Card (3.3v version)
-#wct4xxp_ARGS="t1e1override=15" # Additional parameters for TE4xxP driver
-# or use /etc/modprobe.d/zaptel or /etc/modprobe.conf .
-
-#MODULES="$MODULES wcte12xp" # TE120P - Single Span T1/E1 Card
-
-#MODULES="$MODULES wct1xxp" # T100P - Single Span T1 Card
- # E100P - Single Span E1 Card
-
-#MODULES="$MODULES wcte11xp" # TE110P - Single Span T1/E1 Card
-
-#MODULES="$MODULES wctdm24xxp" # TDM2400P - Modular FXS/FXO interface (1-24 ports)
-
-#MODULES="$MODULES wcfxo" # X100P - Single port FXO interface
- # X101P - Single port FXO interface
-
-#MODULES="$MODULES wctdm" # TDM400P - Modular FXS/FXO interface (1-4 ports)
-
-#MODULES="$MODULES dahdi_dummy" # Zaptel Timing Only Interface
-
-#MODULES="$MODULES xpp_usb" # Xorcom Astribank Device