/[smeserver]/rpms/ppp/sme7/ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch
ViewVC logotype

Annotation of /rpms/ppp/sme7/ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Tue Jun 12 17:08:31 2007 UTC (16 years, 11 months ago) by slords
Branch: MAIN
CVS Tags: ppp-2_4_4-1_3_el4_sme, HEAD 
Import on branch sme7 of package ppp-2.4.4-1.3.el4.sme.src.rpm
1 slords 1.1 diff -urNp --exclude-from=/mdomsch2/excludes --minimal ppp-2.4.3.orig/pppd/pppd.8 ppp-2.4.3/pppd/pppd.8
2     --- ppp-2.4.3.orig/pppd/pppd.8 2004-11-13 06:22:49.000000000 -0600
3     +++ ppp-2.4.3/pppd/pppd.8 2005-08-03 22:10:34.000000000 -0500
4     @@ -1035,7 +1035,7 @@ Ask the peer for up to 2 DNS server addr
5     by the peer (if any) are passed to the /etc/ppp/ip\-up script in the
6     environment variables DNS1 and DNS2, and the environment variable
7     USEPEERDNS will be set to 1. In addition, pppd will create an
8     -/etc/ppp/resolv.conf file containing one or two nameserver lines with
9     +/var/run/ppp/resolv.conf file containing one or two nameserver lines with
10     the address(es) supplied by the peer.
11     .TP
12     .B user \fIname
13     diff -urNp --exclude-from=/mdomsch2/excludes --minimal ppp-2.4.3.orig/scripts/ip-down.local.add.change_resolv_conf ppp-2.4.3/scripts/ip-down.local.add.change_resolv_conf
14     --- ppp-2.4.3.orig/scripts/ip-down.local.add.change_resolv_conf 1999-02-26 22:32:42.000000000 -0600
15     +++ ppp-2.4.3/scripts/ip-down.local.add.change_resolv_conf 2005-08-03 22:11:17.000000000 -0500
16     @@ -10,7 +10,7 @@
17     # Nick Walker (nickwalker@email.com)
18     #
19    
20     -if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
21     +if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
22     if [ -f /etc/ppp/resolv.prev ]; then
23     cp -f /etc/ppp/resolv.prev /etc/resolv.conf
24     else
25     diff -urNp --exclude-from=/mdomsch2/excludes --minimal ppp-2.4.3.orig/scripts/ip-up.local.add.change_resolv_conf ppp-2.4.3/scripts/ip-up.local.add.change_resolv_conf
26     --- ppp-2.4.3.orig/scripts/ip-up.local.add.change_resolv_conf 1999-11-14 21:28:10.000000000 -0600
27     +++ ppp-2.4.3/scripts/ip-up.local.add.change_resolv_conf 2005-08-03 22:11:29.000000000 -0500
28     @@ -10,15 +10,15 @@
29     # Nick Walker (nickwalker@email.com)
30     #
31    
32     -if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
33     +if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
34     rm -f /etc/ppp/resolv.prev
35     if [ -f /etc/resolv.conf ]; then
36     cp /etc/resolv.conf /etc/ppp/resolv.prev
37     grep domain /etc/ppp/resolv.prev > /etc/resolv.conf
38     grep search /etc/ppp/resolv.prev >> /etc/resolv.conf
39     - cat /etc/ppp/resolv.conf >> /etc/resolv.conf
40     + cat /var/run/ppp/resolv.conf >> /etc/resolv.conf
41     else
42     - cp /etc/ppp/resolv.conf /etc
43     + cp /var/run/ppp/resolv.conf /etc
44     fi
45     fi
46    
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed