57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
diff -ru 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 2007-11-03 16:28:27.000000000 +0100
|
|
+++ rp-pppoe-3.8/scripts/pppoe-connect.in 2007-11-03 16:44:08.000000000 +0100
|
|
@@ -174,7 +174,6 @@
|
|
PEERDNS=""
|
|
fi
|
|
|
|
-
|
|
# Backward config file compatibility
|
|
if test "$DEMAND" = "" ; then
|
|
DEMAND=no
|
|
@@ -209,6 +208,7 @@
|
|
|
|
if test "$DEFAULTROUTE" != "no" ; then
|
|
DEFAULTROUTE="defaultroute"
|
|
+ route del default dev $ETH
|
|
else
|
|
DEFAULTROUTE=""
|
|
fi
|
|
@@ -224,11 +224,7 @@
|
|
PPP_STD_OPTIONS="$PLUGIN_OPTS noipdefault noauth default-asyncmap $DEFAULTROUTE hide-password nodetach $PEERDNS mtu 1492 mru 1492 noaccomp nodeflate nopcomp novj novjccomp user $USER lcp-echo-interval $LCP_INTERVAL lcp-echo-failure $LCP_FAILURE $PPPD_EXTRA $LOGFILE"
|
|
|
|
# Jigger DNS if required...
|
|
-if test "$DNSTYPE" = "SERVER" ; then
|
|
- # Sorry, dude...
|
|
- rm -f /etc/resolv.conf
|
|
- ln -s /etc/ppp/resolv.conf /etc/resolv.conf
|
|
-elif test "$DNSTYPE" = "SPECIFY" ; then
|
|
+if test "$DNSTYPE" = "SPECIFY" ; then
|
|
# Sorry, dude...
|
|
rm -f /etc/resolv.conf
|
|
echo "nameserver $DNS1" > /etc/resolv.conf
|
|
@@ -237,6 +233,10 @@
|
|
fi
|
|
fi
|
|
|
|
+# Disable conflicting dhcp client active on the ETH interface
|
|
+[ -e /var/run/dhclient.$ETH.pid ] && \
|
|
+kill -9 `cat /var/run/dhclient.$ETH.pid`
|
|
+
|
|
# PPPoE invocation
|
|
PPPOE_CMD="$PPPOE -p $PPPOE_PIDFILE -I $ETH -T $PPPOE_TIMEOUT -U $PPPOE_SYNC $CLAMPMSS $ACNAME $SERVICENAMEOPT $PPPOE_EXTRA"
|
|
if test "$DEBUG" != "" ; then
|
|
Only in rp-pppoe-3.8.orig/scripts: pppoe-connect.in~
|
|
diff -ru rp-pppoe-3.8.orig/scripts/pppoe-stop.in rp-pppoe-3.8/scripts/pppoe-stop.in
|
|
--- rp-pppoe-3.8.orig/scripts/pppoe-stop.in 2006-04-02 16:29:42.000000000 +0200
|
|
+++ rp-pppoe-3.8/scripts/pppoe-stop.in 2007-11-03 16:42:32.000000000 +0100
|
|
@@ -65,7 +65,7 @@
|
|
PPPD_PID=`cat "$PPPD_PIDFILE"`
|
|
$LOGGER -p daemon.notice "Killing pppd"
|
|
echo "Killing pppd ($PPPD_PID)"
|
|
- kill $PPPD_PID > /dev/null 2>&1 || exit 1
|
|
+ kill -9 $PPPD_PID > /dev/null 2>&1 || exit 1
|
|
fi
|
|
|
|
# Kill pppoe-start
|