dhclient-script: fix static classless routes

This fixes an issue with handling of classless static routes that breaks
Fedora 20 on GCE cloud VMs (#1102830).

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
Signed-off-by: Jiri Popelka <jpopelka@redhat.com>
This commit is contained in:
Filipe Brandenburger 2014-06-12 08:35:30 -07:00 committed by Jiri Popelka
parent 2a209eb4ab
commit 6b7e125d8b
2 changed files with 8 additions and 2 deletions

View File

@ -274,7 +274,10 @@ is_router_reachable() {
mysubnet="$(get_network_address ${new_ip_address} ${new_subnet_mask})"
if [ ! "${routersubnet}" = "${mysubnet}" ]; then
ip -4 route add ${router}/32 dev ${interface}
# TODO: This function should not have side effects such as adding or
# removing routes. Can this be done with "ip route get" or similar
# instead? Are there cases that rely on this route being created here?
ip -4 route replace ${router}/32 dev ${interface}
if [ "$?" -ne 0 ]; then
logmessage "failed to create host route for ${router}"
return 1

View File

@ -18,7 +18,7 @@
Summary: Dynamic host configuration protocol software
Name: dhcp
Version: 4.3.0
Release: 14%{?dist}
Release: 15%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was.
@ -624,6 +624,9 @@ done
%doc doc/html/
%changelog
* Thu Jun 12 2014 Filipe Brandenburger <filbranden@google.com> - 12:4.3.0-15
- dhclient-script: fix issue with classless static routes that breaks Fedora 20 on GCE cloud (#1102830)
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 12:4.3.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild