nixos/containers: Enable use of the network.useHostResolvConf option #34354

yesbox · 2018-01-28T13:56:03Z

Motivation for this change

Currently containers.<name>.networking.useHostResolvConf = false; can never be set as it's in conflict with the true value in container-config.nix. This PR enables setting the option to false.

/etc/resolv.conf from the host will still always be copied. nspawn does this only when private networking is not enabled but NixOS does it unconditionally.

nixpkgs/nixos/modules/virtualisation/containers.nix

Line 85 in 5eb4a83

cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf"

Therefore useHostResolvConf=false relies on resolvconf to overwrite /etc/resolv.conf in the container.

nixpkgs/nixos/modules/system/boot/stage-2-init.sh

Lines 109 to 112 in b4820d4

    
           # Use /etc/resolv.conf supplied by systemd-nspawn, if applicable. 
        
           if [ -n "@useHostResolvConf@" ] && [ -e /etc/resolv.conf ]; then 
        
               resolvconf -m 1000 -a host </etc/resolv.conf 
        
           fi

nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix

Lines 113 to 117 in 07e0c0e

    
                           # Set the static DNS configuration, if given. 
        
                           ${pkgs.openresolv}/sbin/resolvconf -m 1 -a static <<EOF 
        
                           ${optionalString (cfg.nameservers != [] && cfg.domain != null) '' 
        
                             domain ${cfg.domain} 
        
                           ''}

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

fpletz · 2018-01-28T14:42:21Z

Thanks!

Enable use of the network.useHostResolvConf option

baaa3a4

GrahamcOfBorg added 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Jan 28, 2018

fpletz changed the title ~~Enable use of the network.useHostResolvConf option~~ nixos/containers: Enable use of the network.useHostResolvConf option Jan 28, 2018

fpletz merged commit 2b270c1 into NixOS:master Jan 28, 2018

yesbox deleted the optional_host_resolvconf branch February 4, 2018 15:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

nixos/containers: Enable use of the network.useHostResolvConf option #34354

nixos/containers: Enable use of the network.useHostResolvConf option #34354

yesbox commented Jan 28, 2018 •

edited

fpletz commented Jan 28, 2018

	# Use /etc/resolv.conf supplied by systemd-nspawn, if applicable.
	if [ -n "@useHostResolvConf@" ] && [ -e /etc/resolv.conf ]; then
	resolvconf -m 1000 -a host </etc/resolv.conf
	fi

	# Set the static DNS configuration, if given.
	${pkgs.openresolv}/sbin/resolvconf -m 1 -a static <<EOF
	${optionalString (cfg.nameservers != [] && cfg.domain != null) ''
	domain ${cfg.domain}
	''}

nixos/containers: Enable use of the network.useHostResolvConf option #34354

nixos/containers: Enable use of the network.useHostResolvConf option #34354

Conversation

yesbox commented Jan 28, 2018 • edited

Motivation for this change

Things done

fpletz commented Jan 28, 2018

yesbox commented Jan 28, 2018 •

edited