From 92ee1314c1c4f6a93bbca3c4ffaeddc51b5609af Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 7 Jul 2010 21:29:59 +0200
Subject: handle resolv.conf and ntp for pppoe network setup correctly

---
 package/ppp/files/etc/ppp/ip-down.d/01-resolver |  8 ++++++++
 package/ppp/files/etc/ppp/ip-down.d/umts        |  7 -------
 package/ppp/files/etc/ppp/ip-up.d/01-resolver   | 12 ++++++++++++
 package/ppp/files/etc/ppp/ip-up.d/02-ntp        | 10 ++++++++++
 package/ppp/files/etc/ppp/ip-up.d/umts          |  7 -------
 5 files changed, 30 insertions(+), 14 deletions(-)
 create mode 100644 package/ppp/files/etc/ppp/ip-down.d/01-resolver
 delete mode 100755 package/ppp/files/etc/ppp/ip-down.d/umts
 create mode 100644 package/ppp/files/etc/ppp/ip-up.d/01-resolver
 create mode 100644 package/ppp/files/etc/ppp/ip-up.d/02-ntp
 delete mode 100755 package/ppp/files/etc/ppp/ip-up.d/umts

(limited to 'package/ppp/files/etc')

diff --git a/package/ppp/files/etc/ppp/ip-down.d/01-resolver b/package/ppp/files/etc/ppp/ip-down.d/01-resolver
new file mode 100644
index 000000000..78eaea035
--- /dev/null
+++ b/package/ppp/files/etc/ppp/ip-down.d/01-resolver
@@ -0,0 +1,8 @@
+#!/bin/sh
+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
+        else
+                rm -f /etc/resolv.conf
+        fi
+fi
diff --git a/package/ppp/files/etc/ppp/ip-down.d/umts b/package/ppp/files/etc/ppp/ip-down.d/umts
deleted file mode 100755
index 6c812a782..000000000
--- a/package/ppp/files/etc/ppp/ip-down.d/umts
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ "$IF_USE_TEMPLATE" == "umts" ] || exit 0
-
-# enable bit 3, disable bit 4 - i.e. UMTS-LED from blue to green
-LED=$(cat /proc/sys/diag)
-echo $(((LED | 16) ^ 16 | 8)) > /proc/sys/diag
diff --git a/package/ppp/files/etc/ppp/ip-up.d/01-resolver b/package/ppp/files/etc/ppp/ip-up.d/01-resolver
new file mode 100644
index 000000000..0a980bde6
--- /dev/null
+++ b/package/ppp/files/etc/ppp/ip-up.d/01-resolver
@@ -0,0 +1,12 @@
+#!/bin/sh
+if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
+        rm -f /etc/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
+        else
+                cp /etc/ppp/resolv.conf /etc
+        fi
+fi
diff --git a/package/ppp/files/etc/ppp/ip-up.d/02-ntp b/package/ppp/files/etc/ppp/ip-up.d/02-ntp
new file mode 100644
index 000000000..ac25dd567
--- /dev/null
+++ b/package/ppp/files/etc/ppp/ip-up.d/02-ntp
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+# get time via ntpclient if available
+[ -x /usr/sbin/ntpclient ] && ntpclient -s -h pool.ntp.org
+# get time via rdate if available
+[ -x /usr/sbin/rdate ] && rdate -nv pool.ntp.org
+# restart ntpd when enabled
+test x"${ntpd:-NO}" = x"NO" || /etc/init.d/ntpd restart
diff --git a/package/ppp/files/etc/ppp/ip-up.d/umts b/package/ppp/files/etc/ppp/ip-up.d/umts
deleted file mode 100755
index 0c18970e0..000000000
--- a/package/ppp/files/etc/ppp/ip-up.d/umts
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ "$IF_USE_TEMPLATE" == "umts" ] || exit 0
-
-# enable bit 4 i.e. UMTS-LED blue
-LED=$(cat /proc/sys/diag)
-echo $((LED | 16)) > /proc/sys/diag
-- 
cgit v1.2.3