cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@66 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 36 insertions, 83 deletions

diff --git a/root/usr/share/udhcpc/default.bound b/root/usr/share/udhcpc/default.bound
deleted file mode 100755
index f2b9b40b3e..0000000000
--- a/root/usr/share/udhcpc/default.bound
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Sample udhcpc renew script
-
-RESOLV_CONF="/tmp/resolv.conf"
-
-if test -n "$broadcast"; then
-	BROADCAST="broadcast $broadcast"
-fi
-
-if test -n "$subnet"; then
-	NETMASK="netmask $subnet"
-fi
-
-/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
-
-if test -n "$router"; then
-	echo "deleting routers"
-	while /sbin/route del default gw 0.0.0.0 dev $interface
-	do :
-	done
-
-	for i in $router
-	do
-		/sbin/route add default gw $i dev $interface
-	done
-fi
-
-echo -n > $RESOLV_CONF
-
-if test -n "$domain"; then
-	echo domain $domain >> $RESOLV_CONF
-fi
-
-for i in $dns; do
-	echo adding dns $i
-	echo nameserver $i >> $RESOLV_CONF
-done
diff --git a/root/usr/share/udhcpc/default.deconfig b/root/usr/share/udhcpc/default.deconfig
deleted file mode 100755
index b221bcf12b..0000000000
--- a/root/usr/share/udhcpc/default.deconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# Sample udhcpc deconfig script
-
-/sbin/ifconfig $interface 0.0.0.0
diff --git a/root/usr/share/udhcpc/default.renew b/root/usr/share/udhcpc/default.renew
deleted file mode 100755
index f2b9b40b3e..0000000000
--- a/root/usr/share/udhcpc/default.renew
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Sample udhcpc renew script
-
-RESOLV_CONF="/tmp/resolv.conf"
-
-if test -n "$broadcast"; then
-	BROADCAST="broadcast $broadcast"
-fi
-
-if test -n "$subnet"; then
-	NETMASK="netmask $subnet"
-fi
-
-/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
-
-if test -n "$router"; then
-	echo "deleting routers"
-	while /sbin/route del default gw 0.0.0.0 dev $interface
-	do :
-	done
-
-	for i in $router
-	do
-		/sbin/route add default gw $i dev $interface
-	done
-fi
-
-echo -n > $RESOLV_CONF
-
-if test -n "$domain"; then
-	echo domain $domain >> $RESOLV_CONF
-fi
-
-for i in $dns; do
-	echo adding dns $i
-	echo nameserver $i >> $RESOLV_CONF
-done
diff --git a/root/usr/share/udhcpc/default.script b/root/usr/share/udhcpc/default.script
index f5920ba960..87be32d1ad 100755
--- a/root/usr/share/udhcpc/default.script
+++ b/root/usr/share/udhcpc/default.script
@@ -1,7 +1,38 @@
 #!/bin/sh
-# Currently, we only dispatch according to command.  However, a more
-# elaborate system might dispatch by command and interface or do some
-# common initialization first, especially if more dhcp event notifications
-# are added.
+# udhcpc script edited by Tim Riker <Tim@Rikers.org>
+# (slightly modified)
 
-exec /usr/share/udhcpc/default.$1
+[ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
+
+RESOLV_CONF="/tmp/resolv.conf"
+
+case "$1" in
+        deconfig)
+                ifconfig $interface 0.0.0.0
+                ;;
+
+        renew|bound)
+                ifconfig $interface $ip \
+                ${broadcast:+broadcast $broadcast} \
+                ${subnet:+netmask $subnet}
+
+                if [ -n "$router" ] ; then
+                        echo "deleting routers"
+                        while route del default gw 0.0.0.0 dev $interface ; do
+                                :
+                        done
+
+                        for i in $router ; do
+                                route add default gw $i dev $interface
+                        done
+                fi
+
+                echo -n > $RESOLV_CONF
+                ${domain:+echo search $domain >> $RESOLV_CONF}
+                for i in $dns ; do
+                        echo adding dns $i
+                        echo nameserver $i >> $RESOLV_CONF
+                done
+                ;;
+esac
+exit 0