SVN: rc-scripts/trunk/sysconfig: interfaces/ifcfg-ppp0.speedtouch-neostrada network-scripts/ifup-ppp

[radek]

Author: radek
Date: Fri Sep  8 20:35:44 2006
New Revision: 7739

Modified:
   rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.speedtouch-neostrada
   rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp
Log:
- speedtouch-neostrada fixes:
- use modem_run in kernel mode only if PPPOA_FIRMWARE is not empty;
  comment out PPPOA_FIRMWARE in default ifcfg-ppp0
- comment out MTU=1452; doesn't work (for me) if it's defined


Modified: rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.speedtouch-neostrada
==============================================================================
--- rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.speedtouch-neostrada	(original)
+++ rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.speedtouch-neostrada	Fri Sep  8 20:35:44 2006
@@ -4,9 +4,14 @@
 PPPOA_KERNEL=yes
 PPPOA_VPI=0
 PPPOA_VCI=35
-PPPOA_FIRMWARE="/usr/share/speedtouch/mgmt.o"
+
+# If using kernel mode, make sure /lib/firmware/speedtch-{1,2}.bin exists
+# and don't define this variable.
+# Preferably, build speedtouch-firmware from CVS.
+#PPPOA_FIRMWARE="/usr/share/speedtouch/mgmt.o"
+
 AUTH=no
-MTU=1452
+#MTU=1452
 PERSIST=yes
 DEFROUTE=yes
 USEPEERDNS=yes

Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp	Fri Sep  8 20:35:44 2006
@@ -81,7 +81,9 @@
 	if is_yes "${PPPOA_KERNEL}"; then
 		modprobe -s -k speedtch
 		modprobe -s -k pppoatm
-		modem_run -k -s -f "${PPPOA_FIRMWARE}"
+		if [ -n "${PPPOA_FIRMWARE}" ]; then
+			modem_run -k -s -f "${PPPOA_FIRMWARE}"
+		fi
 		MODEMMODE="plugin pppoatm.so"
 		MODEMPORT="${PPPOA_VPI}.${PPPOA_VCI}"
 	else