June 2016 - Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. v19-3-g08762d8
by dreisner＠archlinux.org 30 Jun '16

30 Jun '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official mkinitcpio repository". The branch, master has been updated via 08762d8401ff8e01a3c7a1558e69d5c30c983d20 (commit) via 73189f9515cc40015381a24731205c493107f04f (commit) via 97ac4d37aae084a050be512f6d8f4489054668ad (commit) from 730bf42e4ce461c654598effcc04b7bde4367de7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 08762d8401ff8e01a3c7a1558e69d5c30c983d20 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jun 26 12:41:09 2016 -0400 add f2fs quirk for libcrc32c ref: https://bugs.archlinux.org/task/49380 commit 73189f9515cc40015381a24731205c493107f04f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jun 26 12:28:39 2016 -0400 handle the case of modinfo returning multiple modules This is true of more and more modules with the advent of aliases, e.g. $ modinfo -F filename crc32c /lib/modules/4.6.2-rampage/kernel/arch/x86/crypto/crc32c-intel.ko.gz /lib/modules/4.6.2-rampage/kernel/crypto/crc32c_generic.ko.gz commit 97ac4d37aae084a050be512f6d8f4489054668ad Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jun 26 09:26:03 2016 -0400 Handle softdeps in modules modinfo outputs softdeps which we can add if they exist (failing quietly on not-found). this obviates the need for some of our own module quirks. The output of modinfo can take many forms, as it's nearly freeform text in the .modinfo section of the kernel module. The basic form is: softdep: pre: foo But it might also be: softdep: pre: foo bar post: baz Or: softdep: pre: foo softdep: post: bar So just parse the entire line, discarding anything that ends with a ':'. ----------------------------------------------------------------------- Summary of changes: functions | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio][PATCH 1/3] Handle softdeps in modules
by Dave Reisner 27 Jun '16

27 Jun '16

modinfo outputs softdeps which we can add if they exist (failing quietly on not-found). this obviates the need for some of our own module quirks. The output of modinfo can take many forms, as it's nearly freeform text in the .modinfo section of the kernel module. The basic form is: softdep: pre: foo But it might also be: softdep: pre: foo bar post: baz Or: softdep: pre: foo softdep: post: bar So just parse the entire line, discarding anything that ends with a ':'. --- functions | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/functions b/functions index 362d07b..500dcc0 100644 --- a/functions +++ b/functions @@ -348,7 +348,7 @@ add_module() { # discovered and added. # $1: module name - local module= path= deps= field= value= firmware=() + local module= path= softdeps= deps= field= value= firmware=() local ign_errors=0 [[ $KERNELVERSION == none ]] && return 0 @@ -375,6 +375,14 @@ add_module() { firmware) firmware+=("$value") ;; + softdep) + read -ra softdeps <<<"$value" + for module in "${softdeps[@]}"; do + [[ $module == *: ]] && continue + add_module "$module" + done + add_module "$softdep?" + ;; esac done < <(modinfo -b "$_optmoduleroot" -k "$KERNELVERSION" -0 "$module" 2>/dev/null) @@ -403,9 +411,8 @@ add_module() { ocfs2) add_module "configfs?" ;; - btrfs|libcrc32c) - add_module "crc32c_intel?" - add_module "crc32c?" + btrfs) + add_module "libcrc32c?" ;; esac } @@ -780,7 +787,7 @@ install_modules() { depmod -b "$BUILDROOT" "$KERNELVERSION" # remove all non-binary module.* files (except devname for on-demand module loading) - rm "$moduledest"/modules.!(*.bin|devname) + rm "$moduledest"/modules.!(*.bin|devname|softdep) } # vim: set ft=sh ts=4 sw=4 et: -- 2.8.3

2 3

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.12-1-gc3fb2fd
by jouke＠archlinux.org 24 Jun '16

24 Jun '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The branch, master has been updated via c3fb2fd1d8008146bfa05a3f08f6f226f36771e9 (commit) from 32005f510011698587cc505f5194821d5edc50df (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c3fb2fd1d8008146bfa05a3f08f6f226f36771e9 Author: Konstantin Shalygin <k0ste(a)k0ste.ru> Date: Thu Jun 23 10:52:07 2016 +0600 Add PPPUnit option to mobile_ppp. ----------------------------------------------------------------------- Summary of changes: docs/netctl.profile.5.txt | 3 +++ src/lib/connections/mobile_ppp | 1 + 2 files changed, 4 insertions(+) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [namcap][PATCH] Fix FS#49733
by Michael Straube 17 Jun '16

17 Jun '16

This is a fix for https://bugs.archlinux.org/task/49733 diff --git a/Namcap/util.py b/Namcap/util.py index 21d7163..f99ada1 100644 --- a/Namcap/util.py +++ b/Namcap/util.py @@ -70,6 +70,8 @@ def script_type(path): if m != None: cmd = m.group(1).split() name = cmd[0] + if not re.match('^[a-zA-Z0-9_-]*$', name): + return None if name == 'env': name = cmd[1] return name

2 2

[arch-projects] [netctl] [GIT] Network control utility based on systemd annotated tag 1.12 created. 1.12
by jouke＠archlinux.org 13 Jun '16

13 Jun '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The annotated tag, 1.12 has been created at da8a62e32b16eb99ea4470e6872f2276d0f16845 (tag) tagging 32005f510011698587cc505f5194821d5edc50df (commit) replaces 1.11 tagged by Jouke Witteveen on Mon Jun 13 15:26:50 2016 +0200 - Log ----------------------------------------------------------------- Release 1.12 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJXXrSwAAoJEFa2H7+CSSwV228H/2j57zQ/iNxwerbM9jpZdsXU ifyyXXQdX/xsiUpuNTTxPh8V3OwZEDsNIi5BSm9IqY5sdk7nDxgxwcCJlkIqqiu/ 1hwkRcsTg94tE72yPn9rRtZjis0i39OpTkLc+zpUW9VEcBtcOZUYNxj3dWmdE3gW aP4wtATPDY/pztuv1R0CjaBNFBVKHCDcIgBaXCwSuxLLIR3C1qgivhx5nkd+MgvH ZGv6My8jGgYD7VqojWipyCAXb/F6RxfCKDUoFDz4B87CU+oGefHkCw0rhnC7U6IZ 0OAvrKXRdR9DuIuAtkCNQrjow+GMRN6SBx9bFmAjDilzF3DfDYks3KSifuhiOxY= =ApxQ -----END PGP SIGNATURE----- Jouke Witteveen (7): Fix source URL Fix wifi-menu for profile names containing spaces Fix stopping of terminated wpa_supplicant Support the 'is-active' command Fix documentation link Add quotes for code readability 1.12 release updates Robert Fenk (1): Disable p2p in wpa_supplicant ----------------------------------------------------------------------- hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.11-8-g32005f5
by jouke＠archlinux.org 13 Jun '16

13 Jun '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The branch, master has been updated via 32005f510011698587cc505f5194821d5edc50df (commit) via 1ce8120d89f772cd2f874c38b1a263541b6e71a5 (commit) via 6eccae72c9f551e9f2bf88c5b4392c3a6a21b50d (commit) via 9f6b3598bd4d24daba0fc30ad337c436d137acda (commit) via 4dd043657138c25a9db73a91f7eecb1587102d76 (commit) from 89a9b38a0fef0cc735f91523676e8c4374f33858 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 32005f510011698587cc505f5194821d5edc50df Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Jun 9 21:32:59 2016 +0200 1.12 release updates commit 1ce8120d89f772cd2f874c38b1a263541b6e71a5 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Jun 9 19:03:53 2016 +0200 Add quotes for code readability commit 6eccae72c9f551e9f2bf88c5b4392c3a6a21b50d Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Jun 9 19:03:28 2016 +0200 Fix documentation link commit 9f6b3598bd4d24daba0fc30ad337c436d137acda Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Jun 9 18:44:48 2016 +0200 Support the 'is-active' command Status getting commands are now uniform between netctl and netctl-auto. Both support 'is-active' and 'is-enabled'. The 'current' command is dropped from netctl-auto. Its use case is covered by the 'list' command. Suggested by Evgeniy Alekseev <i(a)arcanis.me> commit 4dd043657138c25a9db73a91f7eecb1587102d76 Author: Robert Fenk <robert.fenk(a)gmail.com> Date: Wed Dec 16 00:45:00 2015 +0100 Disable p2p in wpa_supplicant netctl-auto/wpa_actiond will hang on startup, if wpa_supplicant creates an additional control interface and with the -W switch waits for a connection on all control interfaces on startup. ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- NEWS | 4 +++ contrib/bash-completion | 8 ++--- contrib/zsh-completion | 6 ++-- docs/netctl-auto.1.txt | 11 +++++-- docs/netctl.1.txt | 4 +++ docs/netctl.profile.5.txt | 3 +- src/lib/connections/wireless | 2 +- src/netctl-auto | 74 +++++++++++++++++++++++++++++++------------- src/netctl.in | 3 +- 10 files changed, 82 insertions(+), 35 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20160528-2-g9727b68
by heftig＠archlinux.org 13 Jun '16

13 Jun '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via 9727b684e60c56775ef071be3707059b1d1518e1 (commit) via e3fe7134e2f8d99770226e7a8a7a07cbf106883b (commit) from 70d3c63b5c7b2e62505604df8705bafea5680723 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9727b684e60c56775ef071be3707059b1d1518e1 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Mon Jun 13 00:05:55 2016 +0200 makechrootpkg: Shorten user-config loading code Make use of load_vars returning 1 when the file is missing. Avoids introducing another variable. commit e3fe7134e2f8d99770226e7a8a7a07cbf106883b Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Mon Jun 13 00:00:43 2016 +0200 makechrootpkg: Use XDG_CONFIG_HOME for makepkg.conf Implemented the same way as in makepkg. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> ----------------------------------------------------------------------- Summary of changes: makechrootpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [PATCH v2] makechrootpkg: Use XDG_CONFIG_HOME for makepkg.conf
by Johannes Löthberg 13 Jun '16

13 Jun '16

Implemented the same way as in makepkg. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- Changes since v1: Accidentally used $HOME instead of $USER_HOME in the elif statement. makechrootpkg.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 709e824..6f80384 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -306,7 +306,12 @@ fi umask 0022 -load_vars "$USER_HOME/.makepkg.conf" +XDG_PACMAN_DIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/pacman" +if [[ -r "$XDG_PACMAN_DIR/makepkg.conf" ]]; then + load_vars "$XDG_PACMAN_DIR/makepkg.conf" +elif [[ -r "$USER_HOME/.makepkg.conf" ]]; then + load_vars "$USER_HOME/.makepkg.conf" +fi load_vars /etc/makepkg.conf # Use PKGBUILD directory if these don't exist -- 2.8.3

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.11-3-g89a9b38
by jouke＠archlinux.org 09 Jun '16

09 Jun '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The branch, master has been updated via 89a9b38a0fef0cc735f91523676e8c4374f33858 (commit) via 69743e863681f1bd41566a1e9ee35e8bfb1430f6 (commit) via 39f75437a1eb7a4b37c1a07d7f42cc8c28431468 (commit) from e5c8217b2422bda6801f4a0f81c2d4834517cd4e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 89a9b38a0fef0cc735f91523676e8c4374f33858 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Jun 9 18:55:47 2016 +0200 Fix stopping of terminated wpa_supplicant There was a typo in the code that checked whether wpa_supplicant was already terminated that made us try to kill a non-existing instance of wpa_supplicant. commit 69743e863681f1bd41566a1e9ee35e8bfb1430f6 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Jun 9 18:52:19 2016 +0200 Fix wifi-menu for profile names containing spaces Activating a profile of which the name contains spaces using wifi-menu when the interface is controlled by netctl-auto failed because of missing quotes. This could happen in particular when wifi-menu was used to create a profile for a network of which the SSID contains spaces. commit 39f75437a1eb7a4b37c1a07d7f42cc8c28431468 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Jun 9 18:42:18 2016 +0200 Fix source URL ftp.archlinux.org is decommissioned https://lists.archlinux.org/pipermail/arch-projects/2016-June/004363.html ----------------------------------------------------------------------- Summary of changes: contrib/PKGBUILD.in | 2 +- src/lib/wpa | 2 +- src/wifi-menu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl][PATCH] Support the 'is-active' command
by Jouke Witteveen 09 Jun '16

09 Jun '16

Status getting commands are now uniform between netctl and netctl-auto. Both support 'is-active' and 'is-enabled'. The 'current' command is dropped from netctl-auto. Its use case is covered by the 'list' command. Suggested by Evgeniy Alekseev <i(a)arcanis.me> --- contrib/bash-completion | 8 +++--- contrib/zsh-completion | 6 +++-- docs/netctl-auto.1.txt | 11 +++++--- docs/netctl.1.txt | 4 +++ src/netctl-auto | 72 ++++++++++++++++++++++++++++++++++--------------- src/netctl.in | 3 ++- 6 files changed, 72 insertions(+), 32 deletions(-) diff --git a/contrib/bash-completion b/contrib/bash-completion index 4f73fab..2ab6acb 100644 --- a/contrib/bash-completion +++ b/contrib/bash-completion @@ -23,10 +23,10 @@ _netctl() case $COMP_CWORD in 1) - COMPREPLY=( $(compgen -W "--help --version list store restore stop-all start stop restart switch-to status enable disable reenable is-enabled edit" -- "$cur") ) + COMPREPLY=( $(compgen -W "--help --version list store restore stop-all start stop restart switch-to is-active status enable disable reenable is-enabled edit" -- "$cur") ) ;; 2) - [[ ${COMP_WORDS[COMP_CWORD-1]} = @(start|stop|restart|switch-to|status|enable|disable|reenable|is-enabled|edit) ]] && + [[ ${COMP_WORDS[COMP_CWORD-1]} = @(start|stop|restart|switch-to|is-active|status|enable|disable|reenable|is-enabled|edit) ]] && mapfile -t COMPREPLY < <(IFS=$'\n'; compgen -W "$(_netctl_profiles)" -- "$cur") ;; esac @@ -40,10 +40,10 @@ _netctl_auto() case $COMP_CWORD in 1) - COMPREPLY=( $(compgen -W "--help --version list current switch-to enable disable enable-all disable-all" -- "$cur") ) + COMPREPLY=( $(compgen -W "--help --version list switch-to is-active enable disable enable-all disable-all is-enabled" -- "$cur") ) ;; 2) - [[ ${COMP_WORDS[COMP_CWORD-1]} = @(switch-to|enable|disable) ]] && + [[ ${COMP_WORDS[COMP_CWORD-1]} = @(switch-to|is-active|enable|disable|is-enabled) ]] && mapfile -t COMPREPLY < <(IFS=$'\n'; compgen -W "$(_netctl_profiles)" -- "$cur") ;; esac diff --git a/contrib/zsh-completion b/contrib/zsh-completion index 05c506f..f583526 100644 --- a/contrib/zsh-completion +++ b/contrib/zsh-completion @@ -11,7 +11,7 @@ _wireless_interfaces() { (( $+function[_netctl_command] )) || _netctl_command() { - [[ $words[1] = (start|stop|restart|switch-to|status|enable|disable|reenable|is-enabled|edit) ]] && + [[ $words[1] = (start|stop|restart|switch-to|is-active|status|enable|disable|reenable|is-enabled|edit) ]] && compadd "${(f)$(find -L /etc/netctl -maxdepth 1 -type f -not -name '.*' -not -name '*~' -not -name '*.conf' -not -name '*.service' -printf "%f\n")}" } @@ -27,6 +27,7 @@ _netctl_commands() { 'stop:Stop a profile' 'restart:Restart a profile' 'switch-to:Switch to a profile' + 'is-active:Check whether a profile is active' 'status:Show runtime status of a profile' 'enable:Enable the systemd unit for a profile' 'disable:Disable the systemd unit for a profile' @@ -41,12 +42,13 @@ _netctl-auto_commands() { local -a _commands _commands=( 'list:List available profiles' - 'current:List currently active profiles' 'switch-to:Switch to a profile, enable it if necessary' + 'is-active:Check whether a profile is active' 'enable:Enable a profile for automatic selection' 'disable:Disable a profile temporarily for automatic selection' 'enable-all:Enable all profiles for automatic selection' 'disable-all:Disable all profiles temporarily for automatic selection' + 'is-enabled:Check whether a profile is enabled' ) _describe "netctl-auto commands" _commands } diff --git a/docs/netctl-auto.1.txt b/docs/netctl-auto.1.txt index 6feaeb4..3e038a2 100644 --- a/docs/netctl-auto.1.txt +++ b/docs/netctl-auto.1.txt @@ -29,9 +29,6 @@ The following commands are understood: selection. Active profiles will be marked with a `&ast;', disabled profiles will be marked with a `!'. -*current*:: - Report currently active profiles. - *switch-to [+PROFILE+]*:: Switch to the network profile specified on the command line. The specified profile will be enabled if necessary, the state of all @@ -39,6 +36,10 @@ The following commands are understood: *netctl-auto* to use the specified profile. If a disconnect occurs, *netctl-auto* may select an alternative profile. +*is-active [+PROFILE+]*:: + Check whether the network profile specified on the command line is + active. Prints the current state. + *enable [+PROFILE+]*:: Enable a previously disabled network profile for automatic selection. Every time the *netctl-auto* service is started, all @@ -56,6 +57,10 @@ The following commands are understood: *disable-all*:: Disable all profiles for automatic selection. +*is-enabled [+PROFILE+]*:: + Check whether the specified profile is enabled for the *netctl-auto* + service that is currently running. Prints the current enable status. + *start [+INTERFACE+]*:: Start automatic profile selection on the specified interface. + This command should not be invoked directly, use the following diff --git a/docs/netctl.1.txt b/docs/netctl.1.txt index dc9f3bf..4fe87ca 100644 --- a/docs/netctl.1.txt +++ b/docs/netctl.1.txt @@ -51,6 +51,10 @@ The following commands are understood: Starts the network profile specified on the command line after stopping all profiles that refer to the same interface. +*is-active [+PROFILE+]*:: + Check whether the network profile specified on the command line is + active. Prints the current state. + *status [+PROFILE+]*:: Show terse runtime status information about a profile, followed by its most recent log data from the journal. diff --git a/src/netctl-auto b/src/netctl-auto index b84c0de..1a0bb4c 100755 --- a/src/netctl-auto +++ b/src/netctl-auto @@ -14,13 +14,14 @@ Usage: netctl-auto {COMMAND} ... [--help|--version] Commands: - list List available profiles (active='*', disabled='!') - current List currently active profiles - switch-to [PROFILE] Switch to a profile, enable it if necessary - enable [PROFILE] Enable a profile for automatic selection - disable [PROFILE] Disable a profile temporarily for automatic selection - enable-all Enable all profiles for automatic selection - disable-all Disable all profiles temporarily for automatic selection + list List available profiles (active='*', disabled='!') + switch-to [PROFILE] Switch to a profile, enable it if necessary + is-active [PROFILE] Check whether a profile is active + enable [PROFILE] Enable a profile for automatic selection + disable [PROFILE] Disable a profile for automatic selection + enable-all Enable all profiles for automatic selection + disable-all Disable all profiles for automatic selection + is-enabled [PROFILE] Check whether a profile is enabled END } @@ -63,13 +64,13 @@ list_wpa_profiles() { get_wpa_network_id() { local interface id flag profile while read -r interface id flag profile; do - if [[ "$1" == "$profile" ]]; then + if [[ $profile == "$1" ]]; then echo "$interface" "$id" return 0 fi done < <(list_wpa_profiles) - report_error "Profile '$1' does not exist or is not available" >&2 + report_error "Profile '$1' does not exist or is not available" return 1 } @@ -146,23 +147,50 @@ switch_to() { reenable_networks } -## List currently active profiles -current() { - local interface - for interface in $(list_netctl_auto_interfaces); do - local state=$(wpa_get_state "$interface") - if [[ "$state" == "COMPLETED" ]]; then - wpa_call "$interface" status | sed -n 's/^id_str=//p' +## Check whether a profile is active +# $1: profile name +is_active() { + local interface id flag profile + while read -r interface id flag profile; do + if [[ $profile == "$1" ]]; then + if [[ $flag == "a" ]]; then + echo "active" + return 0 + else + echo "inactive" + return 1 + fi fi - done + done < <(list_wpa_profiles) + echo "unknown profile: '$1'" + return 1 +} + +## Check whether a profile is enabled +# $1: profile name +is_enabled() { + local interface id flag profile + while read -r interface id flag profile; do + if [[ $profile == "$1" ]]; then + if [[ $flag != "d" ]]; then + echo "enabled" + return 0 + else + echo "disabled" + return 1 + fi + fi + done < <(list_wpa_profiles) + echo "unknown profile: '$1'" + return 1 } ## List all available profiles and their status list() { local interface id flag profile - while read -r interface id flag profile; do + list_wpa_profiles | while read -r interface id flag profile; do echo "$(echo $flag | tr 'aed' '* !')" "$profile" - done < <(list_wpa_profiles) + done } ## Start and generate config file for the WPA supplicant, start wpa_actiond @@ -236,7 +264,7 @@ case $# in report_notice "netctl version $NETCTL_VERSION";; --help) usage;; - list|current) + list) "$1";; enable-all|disable-all) profile_enable_disable "$1";; @@ -247,8 +275,8 @@ case $# in case $1 in enable|disable) profile_enable_disable "$1" "$2";; - switch-to) - switch_to "$2";; + switch-to|is-active|is-enabled) + "${1//-/_}" "$2";; start|stop) if [[ -t 0 ]]; then exit_error "Use 'systemctl $1 netctl-auto@$2' to $1 netctl-auto." diff --git a/src/netctl.in b/src/netctl.in index 2953ecf..7b1696a 100644 --- a/src/netctl.in +++ b/src/netctl.in @@ -17,6 +17,7 @@ Commands: stop [PROFILE] Stop a profile restart [PROFILE] Restart a profile switch-to [PROFILE] Switch to a profile + is-active [PROFILE] Check whether a profile is active status [PROFILE] Show runtime status of a profile enable [PROFILE] Enable the systemd unit for a profile disable [PROFILE] Disable the systemd unit for a profile @@ -163,7 +164,7 @@ case $# in esac;; 2) case $1 in - start|stop|restart|status|is-enabled) + start|stop|restart|is-active|status|is-enabled) sd_call "$1" "$2";; switch-to) ensure_root "$(basename "$0")" -- 2.8.3

1 0