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 /contrib | |
| parent | ca7c9bb5514d2026d06a33031e93f1d79a70301f (diff) | |
| parent | 9ac86c2a6e3c8f6e976e7d9e912c87a90d70b2d2 (diff) | |
| download | netctl-0d6aa6cebccdf03b4c3b966721f4ebe3723dce8e.tar.gz netctl-0d6aa6cebccdf03b4c3b966721f4ebe3723dce8e.tar.xz | |
Merge branch '2.6.x'
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/11netcfg | 6 | ||||
| -rw-r--r-- | contrib/bash-completion | 6 |
2 files changed, 7 insertions, 5 deletions
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 ;; |