forked from pool/rp-pppoe
5da48bef51
- Refresh spec-file via spec-cleaner and manual optimisations. * Add make_build and autopatch macros. * Remove group tag and obsoleted conditions. - Refresh and rename patches: * docdir.diff to rp-pppoe-3.14-docdir.patch * nonrfc-modems.diff to rp-pppoe-3.14-nonrfc-modems.patch * release-buildsystem.diff to rp-pppoe-3.14-release-buildsystem.patch * resolve-conf.diff to rp-pppoe-3.14-resolve-conf.patch * rp-pppoe-3.10-config.patch to rp-pppoe-3.14-config.patch * rp-pppoe-3.10-init.patch to rp-pppoe-3.14-init.patch * rp-pppoe-pie.patch to rp-pppoe-3.14-pie.patch * strip.diff to rp-pppoe-3.14-strip.patch - Update to 3.14 * Add -H and -M options for sending HURL and MOTM packets respectively. * Change VERSION macro to RP_VERSION to avoid conflict with pppd macro. OBS-URL: https://build.opensuse.org/request/show/809720 OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=28
23 lines
1.0 KiB
Diff
23 lines
1.0 KiB
Diff
diff -Pdpru rp-pppoe-3.14.orig/scripts/pppoe-connect.in rp-pppoe-3.14/scripts/pppoe-connect.in
|
|
--- rp-pppoe-3.14.orig/scripts/pppoe-connect.in 2020-05-27 03:29:37.000000000 +0300
|
|
+++ rp-pppoe-3.14/scripts/pppoe-connect.in 2020-05-28 03:18:01.758770756 +0300
|
|
@@ -232,16 +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
|
|
- # 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
|
|
if test -n "$DNS2" ; then
|
|
- echo "nameserver $DNS2" >> /etc/resolv.conf
|
|
+ echo "nameserver $DNS2" >> /etc/resolv.conf
|
|
fi
|
|
fi
|
|
|