diff options
| author | Rémy Oudompheng <remy@archlinux.org> | 2011-07-30 16:03:24 +0200 |
|---|---|---|
| committer | Rémy Oudompheng <remy@archlinux.org> | 2011-07-30 16:03:24 +0200 |
| commit | 0d6aa6cebccdf03b4c3b966721f4ebe3723dce8e (patch) | |
| tree | e466d7729d4b144cd34423c960a37b1be2ba2d5d | |
| parent | ca7c9bb5514d2026d06a33031e93f1d79a70301f (diff) | |
| parent | 9ac86c2a6e3c8f6e976e7d9e912c87a90d70b2d2 (diff) | |
| download | netctl-0d6aa6cebccdf03b4c3b966721f4ebe3723dce8e.tar.gz netctl-0d6aa6cebccdf03b4c3b966721f4ebe3723dce8e.tar.xz | |
Merge branch '2.6.x'
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | NEWS | 7 | ||||
| -rwxr-xr-x | contrib/11netcfg | 6 | ||||
| -rw-r--r-- | contrib/bash-completion | 6 | ||||
| -rw-r--r-- | docs/netcfg-profiles.txt | 4 | ||||
| -rw-r--r-- | docs/netcfg.txt | 2 | ||||
| -rwxr-xr-x | scripts/netcfg | 2 | ||||
| -rw-r--r-- | src/connections/ethernet | 8 |
8 files changed, 23 insertions, 14 deletions
@@ -1,5 +1,5 @@ DESTDIR= -VERSION=2.6.4 +VERSION=2.6.5 VPATH = doc .PHONY: install docs @@ -1,3 +1,10 @@ +version 2.6.6 +- fix wrong rc scripts names in suspend hook (FS#20330) +- bash-completion: add -r to option list (FS#25188) + +version 2.6.5 +- specify device name explicitly when setting gateways + version 2.6.4 - documentation update - modify wireless workflow to avoid issues with association diff --git a/contrib/11netcfg b/contrib/11netcfg index b1a5d5f..db65f5a 100755 --- a/contrib/11netcfg +++ b/contrib/11netcfg @@ -7,7 +7,8 @@ suspend_netcfg() { case $NETCFG_SUSPEND in daemons) stopservice net-profiles - stopservice net-auto + stopservice net-auto-wired + stopservice net-auto-wireless ;; retain|*) netcfg all-suspend @@ -19,7 +20,8 @@ resume_netcfg() { case $NETCFG_SUSPEND in daemons) restartservice net-profiles - restartservice net-auto + restartservice net-auto-wired + restartservice net-auto-wireless ;; retain|*) netcfg all-resume diff --git a/contrib/bash-completion b/contrib/bash-completion index 02c8147..cb09803 100644 --- a/contrib/bash-completion +++ b/contrib/bash-completion @@ -18,9 +18,9 @@ _netcfg () cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" - opts="-c -d -a -i -h -v" + opts="-c -d -a -i -h -v -r" lopts="--help --version" - cmds="check-iface down all-down iface-down all-resume all-suspend" + cmds="check-iface down all-down iface-down all-resume all-suspend reconnect" prfls="`find /etc/network.d -maxdepth 1 -not -type d -printf '%f\n'`" case "${cur}" in @@ -44,7 +44,7 @@ _netcfg () _connected_intfs return 0 ;; - -d|down) + -d|down|-r|reconnect) _connected_prfls return 0 ;; diff --git a/docs/netcfg-profiles.txt b/docs/netcfg-profiles.txt index 06c3c1e..07ee81f 100644 --- a/docs/netcfg-profiles.txt +++ b/docs/netcfg-profiles.txt @@ -1,7 +1,7 @@ -% NETCFG-PROFILES(5) netcfg 2.6.4 | Arch Linux +% NETCFG-PROFILES(5) netcfg 2.6.5 | Arch Linux % Rémy Oudompheng <remy@archlinux.org> James Rayner <james@archlinux.org> -% 14 July 2011 +% 17 July 2011 NAME ==== diff --git a/docs/netcfg.txt b/docs/netcfg.txt index 18394ff..a00eb5d 100644 --- a/docs/netcfg.txt +++ b/docs/netcfg.txt @@ -1,4 +1,4 @@ -% NETCFG(8) netcfg 2.6.4 | Arch Linux +% NETCFG(8) netcfg 2.6.5 | Arch Linux % Rémy Oudompheng <remy@archlinux.org> James Rayner <james@archlinux.org> % July 2011 diff --git a/scripts/netcfg b/scripts/netcfg index 11b3646..9786f19 100755 --- a/scripts/netcfg +++ b/scripts/netcfg @@ -2,7 +2,7 @@ . /usr/lib/network/network -NETCFG_VER=2.6.4 +NETCFG_VER=2.6.5 version() { diff --git a/src/connections/ethernet b/src/connections/ethernet index 9b471bb..f9c660c 100644 --- a/src/connections/ethernet +++ b/src/connections/ethernet @@ -104,8 +104,8 @@ ethernet_up() { done fi if [[ -n "$GATEWAY" ]]; then - report_debug ethernet_iproute_up ip route add default via "$GATEWAY" - if ! ip route add default via "$GATEWAY"; then + report_debug ethernet_iproute_up ip route add default via "$GATEWAY" dev "$INTERFACE" + if ! ip route add default via "$GATEWAY" dev "$INTERFACE"; then report_iproute "Adding gateway $GATEWAY failed" fi fi @@ -162,8 +162,8 @@ ethernet_up() { done fi if [[ -n "$GATEWAY6" ]]; then - report_debug ethernet_iproute_up ip -6 route add default via "$GATEWAY6" - if ! ip -6 route add default via "$GATEWAY6"; then + report_debug ethernet_iproute_up ip -6 route add default via "$GATEWAY6" dev "$INTERFACE" + if ! ip -6 route add default via "$GATEWAY6" dev "$INTERFACE"; then report_iproute "Adding gateway $GATEWAY6 failed" fi fi |