Attachment 850307 Details for Bug 836702 – Patch so dhclient-script can cope with pseudo interfaces

[patch] Patch so dhclient-script can cope with pseudo interfaces

dhcp-script-pseudo-fix.patch (text/plain), 1.75 KB, created by Scott Shambarger on 2014-01-14 23:29:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott Shambarger

Created: 2014-01-14 23:29:15 UTC

Size: 1.75 KB

patch

obsolete

>--- SOURCES/dhclient-script.mixed-wanted	2013-10-31 05:01:15.000000000 -0700
>+++ SOURCES/dhclient-script	2014-01-14 14:30:14.762548749 -0800
>@@ -338,7 +338,7 @@
>         ip -4 addr del ${old_ip_address} dev ${interface} label ${interface}:0
>     fi
> 
>-    if [ -n "${old_ip_address}" ] &&
>+    if [ -n "${old_ip_address}" ] && [ -z "${client}" ] &&
>        [ ! "${old_ip_address}" = "${new_ip_address}" ]; then
>         # IP address changed. Delete all routes, and clear the ARP cache.
>         flush_dev ${interface}
>@@ -669,6 +669,9 @@
>         ;;
> 
>     PREINIT)
>+	# no-op for pseudo-interfaces
>+	[ -n "${client}" ] && exit 0
>+
>         if [ -n "${alias_ip_address}" ]; then
>             # Flush alias, its routes will disappear too.
>             ip -4 addr flush dev ${interface} label ${interface}:0 >/dev/null 2>&1
>@@ -687,6 +690,9 @@
>         ;;
> 
>     PREINIT6)
>+	# no-op for pseudo-interfaces
>+	[ -n "${client}" ] && exit 0
>+
>         # ensure interface is up
>         ip link set dev ${interface} up
> 
>@@ -748,8 +754,15 @@
>         fi
> 
>         if [ -n "${old_ip_address}" ]; then
>-            # Delete addresses/routes/arp cache.
>-            flush_dev ${interface}
>+	    if [ -n "${client}" ]; then
>+		# for pseudo interface, just delete old address
>+		ip -4 addr del ${old_ip_address} dev ${interface}
>+		# flush ARP
>+		ip -4 neigh flush dev ${interface} >/dev/null 2>&1
>+	    else
>+                # Delete addresses/routes/arp cache.
>+		flush_dev ${interface}
>+	    fi
>         fi
> 
>         if [ -n "${alias_ip_address}" ]; then
>@@ -774,7 +787,7 @@
>                 exit_with_hooks 0
>             fi
> 
>-            flush_dev ${interface}
>+            [ -z "${client}" ] && flush_dev ${interface}
>             exit_with_hooks 1
>         else
>             exit_with_hooks 1

Actions: View | Diff

Attachments on bug 836702: 595408 | 596115 | 617803 | 665807 | 850306 | 850307