Fix chat-ppp0.tepsa (they no longer send ppp string). ifcfg-password.so is choosen...

svn-id: @4290

diff --git a/sysconfig/interfaces/data/chat-ppp0.tpsa b/sysconfig/interfaces/data/chat-ppp0.tpsa
index a0578281afe247f55ccef5d05af8ff9ed0b3bedb..02ee559e767dba0612303aab15e42f31f0ee5b37 100644 (file)
--- a/sysconfig/interfaces/data/chat-ppp0.tpsa
+++ b/sysconfig/interfaces/data/chat-ppp0.tpsa
@@ -10,6 +10,5 @@ TIMEOUT       60
 OK             $INITSTRING
 OK             atdt$PHONE
 CONNECT                \\c
-ppp\\r         \\c
 ame:           $USER
 ord:           $PASSWORD       

diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index deb0b9b32a346d9fab33085135ce68765bcf0ca0..b09e962185a851e1d3805e32a8c18b6475e87367 100755 (executable)
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -206,7 +206,7 @@ if is_yes "${AUTH}"; then
 elif is_no "${AUTH}"; then
   opts="$opts noauth"
 fi
-if [ -n "$PASSWORD" ]; then
+if is_yes "$PLUGIN_IFCFG_PASSWORD" && [ -n "$PASSWORD" ]; then
   opts="$opts plugin ifcfg-password.so ifcfg /etc/sysconfig/interfaces/$CONFIG"
 fi