# HG changeset patch
# User Dominique Corbex <domcox@slitaz.org>
# Date 1332914459 -7200
# Node ID 1cfb0314e3ff6c2193ff0b0ba29ee51fdbaa37d3
# Parent  29fe613b2eb62ab74070411929cd290745a33995
netbox: PPPoE fixes

diff -r 29fe613b2eb6 -r 1cfb0314e3ff tinyutils/netbox
--- a/tinyutils/netbox	Sat Mar 24 17:18:26 2012 +0000
+++ b/tinyutils/netbox	Wed Mar 28 08:00:59 2012 +0200
@@ -434,7 +434,7 @@
 }
 
 #
-# PPPoe settings.
+# PPPoE settings.
 #
 tab_pppoe()
 {
@@ -442,19 +442,11 @@
 <frame PPPoE>
 	<hbox>
 		<text use-markup="true">
-			<label>"<b>Name:       </b>"</label>
-		</text>
-		<entry>
-			<input>NAME=\$(grep -s ^name /etc/ppp/options); echo "\${NAME#* }"</input>
-			<variable>NAME</variable>
-		</entry>
-	</hbox>
-	<hbox>
-		<text use-markup="true">
 			<label>"<b>Username:</b>"</label>
 		</text>
 		<entry>
-			<variable>USER</variable>
+			<input>PPoE_ID=\$(grep -s ^name /etc/ppp/options); echo "\${PPoE_ID#* }"</input>
+			<variable>PPoE_ID</variable>
 		</entry>
 	</hbox>
 	<hbox>
@@ -462,7 +454,10 @@
 			<label>"<b>Password:</b>"</label>
 		</text>
 		<entry>
-			<variable>PASS</variable>
+			<input>PPoE_PASS=\$(ID=\$(awk '/^name/{print \$2}' /etc/ppp/options) ; \
+				awk -v KEY="\$ID" '\$1==KEY{print \$3}' /etc/ppp/pap-secrets); \
+				echo "\$PPoE_PASS"</input>
+			<variable>PPoE_PASS</variable>
 		</entry>
 	</hbox>
 	<hbox>
@@ -472,26 +467,26 @@
 		<button>
 			<input file icon="accessories-text-editor"></input>
 			<label>Tune</label>
-			<action>[ -n "\$NAME" ] && sed -i \"s/^name .*/name \$NAME/\" /etc/ppp/options</action>
+			<action>[ -n "\$PPoE_ID" ] && sed -i 's/^name .*/name \$PPoE_ID/' /etc/ppp/options</action>
 			<action type="lauch">leafpad /etc/ppp/options</action>
 		</button>
 		<button>
 			<label>Start</label>
 			<input file icon="forward"></input>
-			<action>[ -n "\$USER" ] && grep -qs "^\"\$USER\"" /etc/ppp/pap-secrets
-			&& echo "\"\$USER\"	*	\"\$PASS\"" >> /etc/ppp/pap-secrets</action>
-			<action>[ -n "\$USER" ] && grep -qs "^\"\$USER\"" /etc/ppp/chap-secrets
-			&& echo "\"\$USER\"	*	\"\$PASS\"" >> /etc/ppp/chap-secrets</action>
-			<action>[ -n "\$NAME" ] && sed -i \"s/^name .*/name \$NAME/\" /etc/ppp/options</action>
+			<action>[ -n "\$PPoE_ID" ] && grep -qs "^\$PPoE_ID" /etc/ppp/pap-secrets \
+				|| echo "\$PPoE_ID	*	\$PPoE_PASS" >> /etc/ppp/pap-secrets</action>
+			<action>[ -n "\$PPoE_ID" ] && grep -qs "^\$PPoE_ID" /etc/ppp/chap-secrets \
+				|| echo "\$PPoE_ID	*	\$PPoE_PASS" >> /etc/ppp/chap-secrets</action> 
+			<action>[ -n "\$PPoE_ID" ] && sed -i "s/^name .*/name \$PPoE_ID/" /etc/ppp/options</action>
 			<action>killall udhcpc</action>
-			<action>sed -i s/DHCP=.*/DHCP=\"no\"/ /etc/network.conf</action>
-			<action>sed -i s/PPPOE=.*/PPPOE=\"yes\"/ /etc/network.conf</action>
-			<action>pppd \$INTERFACE &</action>
+			<action>sed -i 's/DHCP=.*/DHCP="no"/' /etc/network.conf</action>
+			<action>sed -i 's/PPPOE=.*/PPPOE="yes"/' /etc/network.conf</action>
+			<action>. /etc/network.conf ; pppd \$INTERFACE &</action>
 		</button>
 		<button>
 			<label>Stop</label>
 			<input file icon="stop"></input>
-			<action>sed -i s/PPPOE=.*/PPPOE=\"no\"/ /etc/network.conf</action>
+			<action>sed -i 's/PPPOE=.*/PPPOE="no"/' /etc/network.conf</action>
 			<action>killall pppd</action>
 		</button>
 	</hbox>