nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 15:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Don't set hostname to "", dhclient no longer needs it.

Browse Source 
svn path=/nixos/trunk/; revision=23783
This commit is contained in:
Eelco Dolstra 2010-09-14 11:58:55 +00:00
parent 071b192c9d
commit 5b3fd663ed
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/tasks/network-interfaces.nix
View File

@ -211,14 +211,9 @@ in
# it's not configured in the NixOS configuration, since it may # it's not configured in the NixOS configuration, since it may
# have been set by dhclient in the meantime. # have been set by dhclient in the meantime.
system.activationScripts.hostname = system.activationScripts.hostname =
(if config.networking.hostName != "" then '' optionalString (config.networking.hostName != "") ''
hostname "${config.networking.hostName}" hostname "${config.networking.hostName}"
'' else '' '';
# dhclient won't do anything if the hostname isn't empty.
if test "$(hostname)" = "(none)"; then
hostname ""
fi
'');
}; };