From c39d64ce6ea9cb2f928153a2ef137f04bea47133 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 1 Jul 2010 18:04:23 +0200
Subject: fix ppp for non nas devices

---
 package/ppp/files/ppp.pre-up | 72 ++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 40 deletions(-)

(limited to 'package/ppp/files/ppp.pre-up')

diff --git a/package/ppp/files/ppp.pre-up b/package/ppp/files/ppp.pre-up
index c83a09177..9f82aa98c 100755
--- a/package/ppp/files/ppp.pre-up
+++ b/package/ppp/files/ppp.pre-up
@@ -19,6 +19,9 @@ if [ "$IF_PPP_MTU" -gt 0 ] ; then
 	NETWORKOPTIONS="mtu $IF_PPP_MTU\nmru $IF_PPP_MTU"
 fi
 
+[ "$IF_PPP_VPI" ] || IF_PPP_VPI=1
+[ "$IF_PPP_VCI" ] || IF_PPP_VCI=32
+
 REPLACE="
 	s,#IDLEOPTIONS#,$IDLEOPTIONS,
 	s,#ENCAPS#,$IF_PPP_ENCAPS,
@@ -33,39 +36,37 @@ REPLACE="
 
 sed "$REPLACE" < /etc/ppp/templates/$IF_USE_TEMPLATE > /etc/ppp/peers/$IF_PROVIDER
 
-[ "$IF_PPP_ENCAPS" ] || encap=0
-[ "$IF_PPP_PAYLOAD" ] || payload=1
-[ "$IF_PPP_VPI" ] || $IF_PPP_VPI=1
-[ "$IF_PPP_VCI" ] || $IF_PPP_VCI=32
-
-case "$IF_PPP_PAYLOAD" in
-bridged)
-	payload=1
-	;;
-routed)
-	payload=0
-	;;
-*)
-	echo "Wrong payload, use either bridged or routed"
-	exit 1
-	;;
-esac
-
-case "$IF_PPP_ENCAPS" in
-llc)
-	encap=0
-	;;
-vc)
-	encap=1
-	;;
-*)
-	echo "Wrong Encapsulation use either llc or vc"
-	exit 1
-	;;
-esac
-
 case "$IF_PPP_DEVICE" in
 nas*)
+	[ "$IF_PPP_ENCAPS" ] || encap=0
+	[ "$IF_PPP_PAYLOAD" ] || payload=1
+
+	case "$IF_PPP_PAYLOAD" in
+		bridged)
+			payload=1
+			;;
+		routed)
+			payload=0
+			;;
+		*)
+			echo "Wrong payload, use either bridged or routed"
+			exit 1
+			;;
+	esac
+
+	case "$IF_PPP_ENCAPS" in
+		llc)
+			encap=0
+			;;
+		vc)
+			encap=1
+			;;
+		*)
+			echo "Wrong Encapsulation use either llc or vc"
+			exit 1
+			;;
+	esac
+
 	count=$(echo $IF_PPP_DEVICE|sed -e "s/nas//")
 	br2684ctl -b -c $count -e $encap -p $payload -a $IF_PPP_VPI.$IF_PPP_VCI
 	ip link set up dev $IF_PPP_DEVICE
@@ -74,10 +75,6 @@ esac
 
 case "$IF_USE_TEMPLATE" in
 umts)
-	# set UMTS-LED to green (bit 3)
-	LED=$(cat /proc/sys/diag)
-	echo $((LED | 8)) > /proc/sys/diag
-
 	# wait for card to initialize
 	COUNT=0
 	while [ $((COUNT++)) -lt 20 ]; do
@@ -110,10 +107,5 @@ umts)
 				ERROR=1
 				;;
 	esac
-
-	if [ "$ERROR" == "1" ]; then
-		echo "$LED" > /proc/sys/diag
-		exit 1
-	fi
 	;;
 esac
-- 
cgit v1.2.3


From 52ee190f6bbbf0bf0c3d354f0370c409aed14506 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 7 Jul 2010 02:16:43 +0200
Subject: more runtime fixes, update of some packages.

- update busybox, dnsmasq, ppp and libusb
- add timezone and hostname configuration for target via menu
- fix resolv.conf creation for dhcp client
- fix usb for alix boards
- enable lsusb and lspci by default
---
 package/ppp/files/ppp.pre-up | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'package/ppp/files/ppp.pre-up')

diff --git a/package/ppp/files/ppp.pre-up b/package/ppp/files/ppp.pre-up
index 9f82aa98c..79fb063ba 100755
--- a/package/ppp/files/ppp.pre-up
+++ b/package/ppp/files/ppp.pre-up
@@ -37,6 +37,9 @@ REPLACE="
 sed "$REPLACE" < /etc/ppp/templates/$IF_USE_TEMPLATE > /etc/ppp/peers/$IF_PROVIDER
 
 case "$IF_PPP_DEVICE" in
+eth*)
+	ip link set up dev $IF_PPP_DEVICE
+	;;
 nas*)
 	[ "$IF_PPP_ENCAPS" ] || encap=0
 	[ "$IF_PPP_PAYLOAD" ] || payload=1
-- 
cgit v1.2.3


From 3c70077f308437281c72431223b532f6f427e1d0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 7 Jul 2010 23:58:22 +0200
Subject: add support for hso umts modems

if you like to use an usb umts modem with hso chipset,
this is the support for it.
use following in /etc/network/interfaces:
auto hso0
iface hso0 inet manual
        pin xxxx
        apn foo.bar

credentials go to freewrt 1.0 supporters...
---
 package/ppp/files/ppp.pre-up | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'package/ppp/files/ppp.pre-up')

diff --git a/package/ppp/files/ppp.pre-up b/package/ppp/files/ppp.pre-up
index 79fb063ba..7f28f32da 100755
--- a/package/ppp/files/ppp.pre-up
+++ b/package/ppp/files/ppp.pre-up
@@ -93,21 +93,21 @@ umts)
 	comgt -s /etc/comgt/waitready.comgt -d $IF_PPP_DEVICE || exit 1
 
 	# set pincode
-	if [ "$IF_UMTS_PINCODE" ]; then
-		COMGTPIN="$IF_UMTS_PINCODE" comgt PIN -d $IF_PPP_DEVICE || ERROR=1
+	if [ "$IF_PIN" ]; then
+		COMGTPIN="$IF_PIN" comgt PIN -d $IF_PPP_DEVICE || exit 1
 	fi
 
 	# set APN
-	COMGTAPN="$IF_UMTS_APN" comgt APN -d $IF_PPP_DEVICE || ERROR=1
+	COMGTAPN="$IF_APN" comgt APN -d $IF_PPP_DEVICE || exit 1
 
 	# set umts/gprs mode if available (Option cards only)
-	case "$IF_UMTS_MODE" in
+	case "$IF_MODE" in
 		gprs_only)	comgt 2G -d $IF_PPP_DEVICE ;;
 		umts_only)	comgt 3G -d $IF_PPP_DEVICE ;;
 		umts_first)	comgt 3G2G -d $IF_PPP_DEVICE ;;
 		"")		;;
-		*)		echo "unknown umts-mode, exiting"
-				ERROR=1
+		*)		echo "unknown mode, exiting"
+				exit 1
 				;;
 	esac
 	;;
-- 
cgit v1.2.3