summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémy Oudompheng <remy@archlinux.org>2011-06-11 16:48:03 +0200
committerRémy Oudompheng <remy@archlinux.org>2011-06-11 16:48:18 +0200
commit23bdfd926aedecc606bf451eaf3a562b285add9c (patch)
treea64f67b6df4907369dbf4160adf6d371da6d0338
parent84567a517c7c671e2eb295bbce67c5f58e97be9f (diff)
downloadnetctl-23bdfd926aedecc606bf451eaf3a562b285add9c.tar.gz
netctl-23bdfd926aedecc606bf451eaf3a562b285add9c.tar.xz
Update NEWS and documentation file
Signed-off-by: Rémy Oudompheng <remy@archlinux.org>
-rw-r--r--NEWS2
-rw-r--r--docs/ethernet25
2 files changed, 23 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index cd6fdb6..73ec79e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,11 @@
version 2.6
+- add support for IPv6 configuration (FS#18699)
- add support for static routes configuration (FS#18700)
- add support for creating tun/tap interfaces (FS#15049)
- wireless: add support for explicit BSSID (FS#24582)
- wireless: add support for ad-hoc connections (FS#19683)
- does not install things in /var/run
+- drops dependency on net-tools package
version 2.5.5
- new connection types: openvpn (FS#21490), vlan
diff --git a/docs/ethernet b/docs/ethernet
index 5df810a..d2166ad 100644
--- a/docs/ethernet
+++ b/docs/ethernet
@@ -10,7 +10,7 @@ This connection method uses the iproute suite of tools and dhcpcd to gain an IP
## Options
INTERFACE (required)
: The wireless interface to configure
-IP (required)
+IP (required for IPv4)
: Can be either 'static' or 'dhcp'. Static requires at least one of ADDR or IPCFG.
ADDR (requires IP of 'static')
: A single IP address to configure a static IP. For example:
@@ -18,10 +18,23 @@ GATEWAY (requires IP of 'static')
: Set specified gateway
NETMASK (requires IP of 'static')
: Set specified netmask. Defaults to 24
-IPCFG
+ROUTES
+: An array of custom routes (<address range> via <gateway>)
+IPCFG
: Array of arguments to pass to 'ip'. The power of this options is that it allows both simple and complicated routing configurations, within the framework of netcfg.
IFOPTS (deprecated, requires IP of 'static')
-: Arguments to pass to 'ifconfig'. This allows you to use the syntax for the older 'ifconfig' tool. Retained for compatability.
+: Arguments to pass to 'ifconfig'. This allows you to use the syntax for the older 'ifconfig' tool. Retained for compatability.
+## IPv6 options
+IP6 (required for IPv6)
+: Either 'dhcp', 'dhcp-noaddr', 'stateless', 'static'.
+ADDR6 (required for IP6=static)
+: An IPv6 address or subnet.
+GATEWAY6 (for IP6=static)
+: The gateway address for IPv6 routing.
+PREFIXLEN (for IP6=static)
+: The netmask for the interface address.
+ROUTES6
+: An array of custom routes (<address range> via <gateway>)
### DNS
DNS
: Array of DNS nameservers. Simply specify the IP's of each of the DNS nameservers.
@@ -34,12 +47,16 @@ HOSTNAME
DNS1, DNS2 (deprecated)
: First and second DNS servers for /etc/resolv.conf
### DHCP
-DHCP_OPTIONS
+DHCP_OPTIONS (ipv4)
: String. Any extra arguments to pass to the dhcp client, presently dhcpcd.
DHCP_TIMEOUT
: Integer. Maximum time to try for a DHCP IP. Default is 10 seconds.
DHCLIENT
: yes/no. Use dhclient instead of dhcpcd. Defaults to no
+DHCLIENT_OPTIONS (ipv4)
+: String. Extra options to pass to dhclient for IPv4.
+DHCLIENT6_OPTIONS (ipv6)
+: String. Extra options to pass to dhclient for IPv6.
### 802.11x Authentication
AUTH8021X
: Use 802.11x authentication. Enable with 'yes'.