Use PAPNAME for neo example. Fix ifcfg-password.so plugin usage.

svn-id: @4297

diff --git a/sysconfig/interfaces/ifcfg-ppp0.eagle-usb-neostrada b/sysconfig/interfaces/ifcfg-ppp0.eagle-usb-neostrada
index b28dfe0819f91ca31c0a8df291a0681faef1f27d..14fb716dab3ca956aa3a514d0bbe2bcf6a707d8c 100644 (file)
--- a/sysconfig/interfaces/ifcfg-ppp0.eagle-usb-neostrada
+++ b/sysconfig/interfaces/ifcfg-ppp0.eagle-usb-neostrada
@@ -6,4 +6,9 @@ MTU=1480
 PERSIST=yes
 DEFROUTE=yes
 USEPEERDNS=yes
-USER=XXX@neostrada.pl
+PAPNAME=XXX@neostrada.pl
+# put password in /etc/ppp/pap-secrets or install
+# ppp-plugin-ifcfg-password and uncommend following lines
+# PLUGIN_IFCFG_PASSWORD=yes
+# PASSWORD=YYYY
+

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