ppp/sme7/ppp-2.4.2-change_resolv_conf.patch

--- 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
 
1	slords	1.1	--- ppp-2.4.2/scripts/ip-down.local.add.change_resolv_conf 1999-02-27 05:32:42.000000000 +0100
2			+++ ppp-2.4.2/scripts/ip-down.local.add 2004-09-14 14:36:20.058008752 +0200
3			@@ -9,12 +9,13 @@
4			#
5			# Nick Walker (nickwalker@email.com)
6			#
7			+. /etc/sysconfig/network-scripts/network-functions
8
9			-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
10			- if [ -f /etc/ppp/resolv.prev ]; then
11			- cp -f /etc/ppp/resolv.prev /etc/resolv.conf
12			+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
13			+ if [ -f /var/run/ppp/resolv.prev ]; then
14			+ change_resolv_conf /var/run/ppp/resolv.prev
15			else
16			- rm -f /etc/resolv.conf
17			+ change_resolv_conf
18			fi
19			fi
20
21			--- ppp-2.4.2/scripts/ip-up.local.add.change_resolv_conf 1999-11-15 04:28:10.000000000 +0100
22			+++ ppp-2.4.2/scripts/ip-up.local.add 2004-09-14 14:37:39.129061828 +0200
23			@@ -9,16 +9,19 @@
24			#
25			# Nick Walker (nickwalker@email.com)
26			#
27			+. /etc/sysconfig/network-scripts/network-functions
28
29			-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
30			- rm -f /etc/ppp/resolv.prev
31			+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
32			+ rm -f /var/run/ppp/resolv.prev
33			if [ -f /etc/resolv.conf ]; then
34			- cp /etc/resolv.conf /etc/ppp/resolv.prev
35			- grep domain /etc/ppp/resolv.prev > /etc/resolv.conf
36			- grep search /etc/ppp/resolv.prev >> /etc/resolv.conf
37			- cat /etc/ppp/resolv.conf >> /etc/resolv.conf
38			+ cp /etc/resolv.conf /var/run/ppp/resolv.prev
39			+ rscf=/var/run/ppp/resolv.new
40			+ grep domain /var/run/ppp/resolv.prev > $rscf
41			+ grep search /var/run/ppp/resolv.prev >> $rscf
42			+ change_resolv_conf $rscf
43			+ rm -f $rscf
44			else
45			- cp /etc/ppp/resolv.conf /etc
46			+ change_resolv_conf /var/run/ppp/resolv.conf
47			fi
48			fi
49