source: npl/internetserver/poptop_ppp/patches/ppp-2.4.2-change_resolv_conf.patch @ e1b2384

ppp-2.4.2/scripts/ip-down.local.add

@@ -9 +9 @@
 #
 # 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

@@ -9 +9 @@
 #
 # 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