Attachment 908188 Details for Bug 1102830 – Patch to use ip route replace

[patch] Patch to use ip route replace

0001-dhclient-script-fix-static-classless-routes.patch (text/plain), 2.15 KB, created by Filipe Brandenburger on 2014-06-12 15:41:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Filipe Brandenburger

Created: 2014-06-12 15:41:10 UTC

Size: 2.15 KB

patch

obsolete

>From 46c05c22126b4a00d1d7fec8e1d8c2b76513cab3 Mon Sep 17 00:00:00 2001
>From: Filipe Brandenburger <filbranden@google.com>
>Date: Thu, 12 Jun 2014 08:35:30 -0700
>Subject: [PATCH] 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>
>---
> dhclient-script | 5 ++++-
> dhcp.spec       | 5 ++++-
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/dhclient-script b/dhclient-script
>index 7d348c595914..364bd9478ea8 100644
>--- a/dhclient-script
>+++ b/dhclient-script
>@@ -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
>diff --git a/dhcp.spec b/dhcp.spec
>index 8ff71f9ef9f4..abc5dfa53446 100644
>--- a/dhcp.spec
>+++ b/dhcp.spec
>@@ -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
> 
>-- 
>2.0.0.526.g5318336
>

Actions: View | Diff

Attachments on bug 1102830: 908188