alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Make sure that dhclient properly sets the hostname after reboots.

Browse source 
svn path=/nixpkgs/branches/modular-python/; revision=26659
This commit is contained in:
Eelco Dolstra 2011-04-01 15:04:20 +00:00
parent 1f01ba2ce4
commit 601aeb1aa8
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/tools/networking/dhcp/default.nix
View file

@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
# recover when the wlan interface goes down. Instead just flush # recover when the wlan interface goes down. Instead just flush
# all addresses, routes and neighbours of the interface. # all addresses, routes and neighbours of the interface.
./flush-if.patch ./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.
./set-hostname.patch
]; ];
# Fixes "socket.c:591: error: invalid application of 'sizeof' to # Fixes "socket.c:591: error: invalid application of 'sizeof' to

14
pkgs/tools/networking/dhcp/set-hostname.patch Normal file
View file

@ -0,0 +1,14 @@
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
@@ -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 ] && \