forked from pool/rp-pppoe
Marcus Meissner
3d69a0a2fe
upgrade to 3.11 OBS-URL: https://build.opensuse.org/request/show/173008 OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=7
22 lines
944 B
Diff
22 lines
944 B
Diff
Index: scripts/pppoe-connect.in
|
|
===================================================================
|
|
--- scripts/pppoe-connect.in.orig
|
|
+++ scripts/pppoe-connect.in
|
|
@@ -232,11 +232,12 @@ fi
|
|
PPP_STD_OPTIONS="$PLUGIN_OPTS $DOUNIT noipdefault noauth default-asyncmap $DEFAULTROUTE hide-password nodetach $PEERDNS mtu $MTU mru $MRU noaccomp nodeflate nopcomp novj novjccomp user $USER lcp-echo-interval $LCP_INTERVAL lcp-echo-failure $LCP_FAILURE $PPPD_EXTRA"
|
|
|
|
# Jigger DNS if required...
|
|
-if test "$DNSTYPE" = "SERVER" ; then
|
|
+#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
|
|
+ # done in ip-up/down
|
|
+ # rm -f /etc/resolv.conf
|
|
+ # ln -s /etc/ppp/resolv.conf /etc/resolv.conf
|
|
+if test "$DNSTYPE" = "SPECIFY" ; then
|
|
# Sorry, dude...
|
|
rm -f /etc/resolv.conf
|
|
echo "nameserver $DNS1" > /etc/resolv.conf
|