summary refs log tree commit diff
path: root/nixos/doc/manual/configuration/ipv4-config.xml
diff options
context:
space:
mode:
authorRob Vermaas <rob.vermaas@gmail.com>2014-08-31 10:58:54 +0200
committerRob Vermaas <rob.vermaas@gmail.com>2014-08-31 10:58:54 +0200
commitea8910652fcecbcd4f21aa1c66b1a0a239408b04 (patch)
tree539cd8cdd81d4edad720d7d4de6f927d82f5107c /nixos/doc/manual/configuration/ipv4-config.xml
parent2f697bf6931b24cdd428e22effbf6427a85afd42 (diff)
downloadnixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar
nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.gz
nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.bz2
nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.lz
nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.xz
nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.zst
nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.zip
Revert "Merge pull request #3182 from wkennington/master.ipv6"
This reverts commit b23fd6585481a42937e105d5fce630a549900e86, reversing
changes made to 43654cba2c280ce17b81db44993d1c1bcae3a9c6.
Diffstat (limited to 'nixos/doc/manual/configuration/ipv4-config.xml')
-rw-r--r--nixos/doc/manual/configuration/ipv4-config.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
index 053501b1736..e2c51518349 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -12,9 +12,12 @@ interfaces.  However, you can configure an interface manually as
 follows:
 
 <programlisting>
-networking.interfaces.eth0.ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ];
+networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; };
 </programlisting>
 
+(The network prefix can also be specified using the option
+<literal>subnetMask</literal>,
+e.g. <literal>"255.255.255.0"</literal>, but this is deprecated.)
 Typically you’ll also want to set a default gateway and set of name
 servers: