From 7cbb426eae1d804963744177f9d2e95221329e2e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Mar 2011 12:55:55 +0000 Subject: [PATCH] * dhclient: don't flush IPv6 addresses/routes. svn path=/nixpkgs/trunk/; revision=26455 --- pkgs/tools/networking/dhcp/flush-if.patch | 6 +++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dhcp/flush-if.patch b/pkgs/tools/networking/dhcp/flush-if.patch index a6d914231ee..ff72248b0ab 100644 --- a/pkgs/tools/networking/dhcp/flush-if.patch +++ b/pkgs/tools/networking/dhcp/flush-if.patch @@ -10,9 +10,9 @@ diff --exclude '*~' -rc dhcp-4.1.0p1-orig/client/scripts/linux dhcp-4.1.0p1/clie + # Delete the old addresses, routes and ARP information for this + # interface. + flush_if() { -+ ${ip} address flush dev $interface -+ ${ip} route flush dev $interface -+ ${ip} neighbour flush dev $interface ++ ${ip} -4 address flush dev $interface ++ ${ip} -4 route flush dev $interface ++ ${ip} -4 neighbour flush dev $interface + } + # Invoke the local dhcp client enter hooks, if they exist. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6fda91ed12..e6b41900117 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1504,6 +1504,7 @@ let zsync = callPackage ../tools/compression/zsync { }; + ### SHELLS