summaryrefslogtreecommitdiff
blob: dec2276aa0d153ef5d05ec1eeb453c5d21fc0dcf (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
diff -Nru rp-pppoe-3.8.orig/configs/pppoe.conf rp-pppoe-3.8/configs/pppoe.conf
--- rp-pppoe-3.8.orig/configs/pppoe.conf	2006-04-02 17:29:41.000000000 +0300
+++ rp-pppoe-3.8/configs/pppoe.conf	2006-04-21 10:06:46.170420000 +0300
@@ -115,7 +115,7 @@
 FIREWALL=NONE
 
 # Linux kernel-mode plugin for pppd.  If you want to try the kernel-mode
-# plugin, use LINUX_PLUGIN=/etc/ppp/plugins/rp-pppoe.so
+# plugin, use LINUX_PLUGIN=rp-pppoe.so
 LINUX_PLUGIN=
 
 # Any extra arguments to pass to pppoe.  Normally, use a blank string
diff -Nru rp-pppoe-3.8.orig/scripts/pppoe-connect.in rp-pppoe-3.8/scripts/pppoe-connect.in
--- rp-pppoe-3.8.orig/scripts/pppoe-connect.in	2006-04-02 17:29:42.000000000 +0300
+++ rp-pppoe-3.8/scripts/pppoe-connect.in	2006-04-21 10:06:58.951218750 +0300
@@ -197,7 +197,7 @@
 
 # If we're using kernel-mode PPPoE on Linux...
 if test "$LINUX_PLUGIN" != "" ; then
-    PLUGIN_OPTS="plugin $LINUX_PLUGIN nic-$ETH"
+    PLUGIN_OPTS="plugin $LINUX_PLUGIN"
     if test -n "$SERVICENAME" ; then
 	PLUGIN_OPTS="$PLUGIN_OPTS rp_pppoe_service $SERVICENAME"
     fi
@@ -295,7 +295,7 @@
 	$SETSID $OVERRIDE_PPPD_COMMAND &
 	echo "$!" > $PPPD_PIDFILE
     elif test "$LINUX_PLUGIN" != "" ; then
-	$SETSID $PPPD $PPP_STD_OPTIONS $DEMAND &
+	$SETSID $PPPD $DEMAND $PPP_STD_OPTIONS &
 	echo "$!" > $PPPD_PIDFILE
     else
 	$SETSID $PPPD pty "$PPPOE_CMD" \