ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 12:22:37 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33620 from dtzWill/update/dhcp-4.3.6

Browse Source 
dhcp: 4.3.4 -> 4.3.6
This commit is contained in:
Franz Pletz 2018-03-04 08:12:51 +00:00 committed by GitHub
commit a3a6f58141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/networking/dhcp/default.nix
View File

@ -4,19 +4,15 @@
stdenv.mkDerivation rec {
name = "dhcp-${version}";
version = "4.3.4";
version = "4.3.6-P1";
src = fetchurl {
url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
sha256 = "0zk0imll6bfyp9p4ndn8h6s4ifijnw5bhixswifr5rnk7pp5l4gm";
sha256 = "1hx3az6ckvgvybr1ag4k9kqr8zfcpzcww4vpw5gz0mi8y2z7gl9g";
};
patches =
[ # Don't bring down interfaces, because wpa_supplicant doesn't
# recover when the wlan interface goes down. Instead just flush
# all addresses, routes and neighbours of the interface.
./flush-if.patch
[
# Make sure that the hostname gets set on reboot. Without this
# patch, the hostname doesn't get set properly if the old
# hostname (i.e. before reboot) is equal to the new hostname.

76
pkgs/tools/networking/dhcp/flush-if.patch
View File

@ -1,76 +0,0 @@
diff --exclude '*~' -rc dhcp-4.1.0p1-orig/client/scripts/linux dhcp-4.1.0p1/client/scripts/linux
*** dhcp-4.1.0p1-orig/client/scripts/linux 2008-05-23 15:56:07.000000000 +0200
--- dhcp-4.1.0p1/client/scripts/linux 2009-09-29 17:56:57.000000000 +0200
***************
*** 67,72 ****
--- 67,80 ----
exit $exit_status
}
+ # Delete the old addresses, routes and ARP information for this
+ # interface.
+ flush_if() {
+ ${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.
if [ -f /etc/dhclient-enter-hooks ]; then
exit_status=0
***************
*** 150,159 ****
ifconfig $interface:0- inet 0
fi
if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
! # IP address changed. Bringing down the interface will delete all routes,
! # and clear the ARP cache.
! ifconfig $interface inet 0 down
!
fi
if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
[ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
--- 158,165 ----
ifconfig $interface:0- inet 0
fi
if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
! # IP address changed.
! flush_if
fi
if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
[ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
***************
*** 189,196 ****
ifconfig $interface:0- inet 0
fi
if [ x$old_ip_address != x ]; then
! # Shut down interface, which will delete routes and clear arp cache.
! ifconfig $interface inet 0 down
fi
if [ x$alias_ip_address != x ]; then
ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--- 195,201 ----
ifconfig $interface:0- inet 0
fi
if [ x$old_ip_address != x ]; then
! flush_if
fi
if [ x$alias_ip_address != x ]; then
ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
***************
*** 225,231 ****
make_resolv_conf
exit_with_hooks 0
fi
! ifconfig $interface inet 0 down
exit_with_hooks 1
fi
--- 230,236 ----
make_resolv_conf
exit_with_hooks 0
fi
! flush_if
exit_with_hooks 1
fi

24
pkgs/tools/networking/dhcp/set-hostname.patch
View File

@ -1,14 +1,12 @@
diff -ru -x '*~' dhcp-4.1.2-P1-orig//client/scripts/linux dhcp-4.1.2-P1//client/scripts/linux
--- dhcp-4.1.2-P1-orig//client/scripts/linux 2010-09-15 00:49:48.000000000 +0200
+++ dhcp-4.1.2-P1//client/scripts/linux 2011-04-01 16:08:10.984372269 +0200
--- a/client/scripts/linux 2010-09-15 00:49:48.000000000 +0200
+++ b/client/scripts/linux 2011-04-01 16:08:10.984372269 +0200
@@ -133,9 +133,7 @@
[ x$current_hostname = "x(none)" ] || \
[ x$current_hostname = xlocalhost ] || \
[ x$current_hostname = x$old_host_name ]; then
- if [ x$new_host_name != x$old_host_name ]; then
- hostname "$new_host_name"
- fi
+ hostname "$new_host_name"
fi
if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
[ "$current_hostname" = '(none)' ] ||
[ "$current_hostname" = 'localhost' ] ||
[ "$current_hostname" = "$old_host_name" ]; then
- if [ "$new_host_name" != "$old_host_name" ]; then
- hostname "$new_host_name"
- fi
+ hostname "$new_host_name"
fi
fi