Repository: cloudstack Updated Branches: refs/heads/4.3 6d0650bbc -> f6aff77b8
CLOUDSTACK-6665: A fix for vpc routers not releasing dhcp leases. Author: John Nielsen <[email protected]> Signed-off-by: Sebastien Goasguen <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0e50cb12 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0e50cb12 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0e50cb12 Branch: refs/heads/4.3 Commit: 0e50cb1246f762e9d1f0ece937395ffb193c6452 Parents: dae442e Author: Joris van Lieshout <[email protected]> Authored: Tue May 20 11:02:14 2014 +0200 Committer: Sebastien Goasguen <[email protected]> Committed: Wed Jul 2 16:28:02 2014 +0200 ---------------------------------------------------------------------- systemvm/patches/debian/config/root/edithosts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0e50cb12/systemvm/patches/debian/config/root/edithosts.sh ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/root/edithosts.sh b/systemvm/patches/debian/config/root/edithosts.sh index 57ee7dc..0ff6cc5 100755 --- a/systemvm/patches/debian/config/root/edithosts.sh +++ b/systemvm/patches/debian/config/root/edithosts.sh @@ -99,7 +99,7 @@ if [ $dnsmasq_managed_lease -eq 1 ] then #release previous dhcp lease if present logger -t cloud "edithosts: releasing $ipv4" - dhcp_release eth0 $ipv4 $(grep "$ipv4 " $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1 + dhcp_release $(ip route get "$ipv4/32" | grep " dev " | sed -e "s/^.* dev \([^ ]*\) .*$/\1/g") $ipv4 $(grep "$ipv4 " $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1 logger -t cloud "edithosts: released $ipv4" fi
