From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 10 Jun 2012 19:26:57 +0000 (+0000)
Subject: dhcp-client: Fix routing configuration.
X-Git-Tag: 004~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2af98498b79877e742a79714b11aa3867d6274c7;p=network.git

dhcp-client: Fix routing configuration.
---

diff --git a/dhclient-script b/dhclient-script
index e56c096c..651a630e 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -10,8 +10,6 @@ assert isset reason
 
 assert device_exists ${interface}
 
-# XXX LOAD ZONE CONFIGURATION
-
 basename="$(basename $0)"
 log DEBUG "${basename} called for interface=${interface} reason=${reason}"
 
@@ -97,11 +95,12 @@ case "${reason}" in
 					# Save configuration
 					routing_db_set ${interface} ipv4 type "ipv4-dhcp"
 					routing_db_set ${interface} ipv4 local-ip-address "${new_ip_address}/${new_prefix}"
-					routing_db_set ${interface} ipv4 remote-ip-address "${new_router}"
+					routing_db_set ${interface} ipv4 remote-ip-address "${new_routers}"
 					routing_db_set ${interface} ipv4 active 1
 
 					# Update the routing tables.
 					routing_update ${interface} ipv4
+					routing_default_update
 				fi
 				;;
 		esac
@@ -115,6 +114,9 @@ case "${reason}" in
 			ipv4_flush_device ${interface}
 		fi
 
+		routing_db_remove ${interface} ipv4
+		routing_default_update
+
 		exit 0
 		;;
 esac