62 lines
2.3 KiB
Diff
62 lines
2.3 KiB
Diff
diff -urNp --exclude-from=/mdomsch2/excludes --minimal ppp-2.4.3.orig/pppd/pppd.8 ppp-2.4.3/pppd/pppd.8
|
|
--- ppp-2.4.3.orig/pppd/pppd.8 2004-11-13 06:22:49.000000000 -0600
|
|
+++ ppp-2.4.3/pppd/pppd.8 2005-08-03 22:10:34.000000000 -0500
|
|
@@ -1035,7 +1035,7 @@ Ask the peer for up to 2 DNS server addr
|
|
by the peer (if any) are passed to the /etc/ppp/ip\-up script in the
|
|
environment variables DNS1 and DNS2, and the environment variable
|
|
USEPEERDNS will be set to 1. In addition, pppd will create an
|
|
-/etc/ppp/resolv.conf file containing one or two nameserver lines with
|
|
+/var/run/ppp/resolv.conf file containing one or two nameserver lines with
|
|
the address(es) supplied by the peer.
|
|
.TP
|
|
.B user \fIname
|
|
--- ppp-2.4.2/scripts/ip-down.local.add.change_resolv_conf 1999-02-27 05:32:42.000000000 +0100
|
|
+++ ppp-2.4.2/scripts/ip-down.local.add 2004-09-14 14:36:20.058008752 +0200
|
|
@@ -9,12 +9,13 @@
|
|
#
|
|
# Nick Walker (nickwalker@email.com)
|
|
#
|
|
+. /etc/sysconfig/network-scripts/network-functions
|
|
|
|
-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
|
|
- if [ -f /etc/ppp/resolv.prev ]; then
|
|
- cp -f /etc/ppp/resolv.prev /etc/resolv.conf
|
|
+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
|
|
+ if [ -f /var/run/ppp/resolv.prev ]; then
|
|
+ change_resolv_conf /var/run/ppp/resolv.prev
|
|
else
|
|
- rm -f /etc/resolv.conf
|
|
+ change_resolv_conf
|
|
fi
|
|
fi
|
|
|
|
--- ppp-2.4.2/scripts/ip-up.local.add.change_resolv_conf 1999-11-15 04:28:10.000000000 +0100
|
|
+++ ppp-2.4.2/scripts/ip-up.local.add 2004-09-14 14:37:39.129061828 +0200
|
|
@@ -9,16 +9,19 @@
|
|
#
|
|
# Nick Walker (nickwalker@email.com)
|
|
#
|
|
+. /etc/sysconfig/network-scripts/network-functions
|
|
|
|
-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
|
|
- rm -f /etc/ppp/resolv.prev
|
|
+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
|
|
+ rm -f /var/run/ppp/resolv.prev
|
|
if [ -f /etc/resolv.conf ]; then
|
|
- cp /etc/resolv.conf /etc/ppp/resolv.prev
|
|
- grep domain /etc/ppp/resolv.prev > /etc/resolv.conf
|
|
- grep search /etc/ppp/resolv.prev >> /etc/resolv.conf
|
|
- cat /etc/ppp/resolv.conf >> /etc/resolv.conf
|
|
+ cp /etc/resolv.conf /var/run/ppp/resolv.prev
|
|
+ rscf=/var/run/ppp/resolv.new
|
|
+ grep domain /var/run/ppp/resolv.prev > $rscf
|
|
+ grep search /var/run/ppp/resolv.prev >> $rscf
|
|
+ change_resolv_conf $rscf
|
|
+ rm -f $rscf
|
|
else
|
|
- cp /etc/ppp/resolv.conf /etc
|
|
+ change_resolv_conf /var/run/ppp/resolv.conf
|
|
fi
|
|
fi
|
|
|