diff options
| author | Rémy Oudompheng <remy@archlinux.org> | 2011-06-19 23:49:13 +0200 |
|---|---|---|
| committer | Rémy Oudompheng <remy@archlinux.org> | 2011-06-19 23:49:30 +0200 |
| commit | 685609ae1b725fa60ab1cc07967be4f452995ee1 (patch) | |
| tree | be7f90533ea6c58f081367968865857b1a81ea72 | |
| parent | e6f7491fb2e7a355236e78e853f8b95e47c9fd1e (diff) | |
| download | netctl-685609ae1b725fa60ab1cc07967be4f452995ee1.tar.gz netctl-685609ae1b725fa60ab1cc07967be4f452995ee1.tar.xz | |
Add basic tuntap IP configuration capabilities
Signed-off-by: Rémy Oudompheng <remy@archlinux.org>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | docs/examples/tuntap | 5 | ||||
| -rwxr-xr-x | scripts/netcfg | 2 | ||||
| -rw-r--r-- | src/connections/tuntap | 4 |
5 files changed, 15 insertions, 2 deletions
@@ -1,5 +1,5 @@ DESTDIR= -VERSION=2.6 +VERSION=2.6.1 VPATH = doc .PHONY: install docs @@ -1,3 +1,7 @@ +version 2.6.1 +- fix missing mkdir for net-auto-wireless +- add basic configuration capabilities to tun/tap interfaces + version 2.6 - add support for IPv6 configuration (FS#18699) - add support for static routes configuration (FS#18700) diff --git a/docs/examples/tuntap b/docs/examples/tuntap index 2917875..1563520 100644 --- a/docs/examples/tuntap +++ b/docs/examples/tuntap @@ -4,3 +4,8 @@ MODE='tun' USER='nobody' GROUP='nobody' +## Example IP configuration +#IP='static' +#SKIPNOCARRIER='yes' +#ADDR='10.10.1.2' + diff --git a/scripts/netcfg b/scripts/netcfg index e00794d..cb536b9 100755 --- a/scripts/netcfg +++ b/scripts/netcfg @@ -2,7 +2,7 @@ . /usr/lib/network/network -NETCFG_VER=2.6 +NETCFG_VER=2.6.1 version() { diff --git a/src/connections/tuntap b/src/connections/tuntap index e2c8c5d..27641e4 100644 --- a/src/connections/tuntap +++ b/src/connections/tuntap @@ -11,12 +11,16 @@ tuntap_up() { ip tuntap add dev "$INTERFACE" mode "$MODE" \ user "$USER" group "$GROUP" &>/dev/null fi + bring_interface up "$INTERFACE" + "$CONN_DIR/ethernet" up "$1" return 0 } tuntap_down() { load_profile "$1" + "$CONN_DIR/ethernet" down "$1" + bring_interface down "$INTERFACE" ip tuntap del "$INTERFACE" mode "$MODE" &>/dev/null return 0 } |