diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/netcfg | 23 | ||||
| -rwxr-xr-x | scripts/netcfg-wpa_actiond | 4 |
2 files changed, 13 insertions, 14 deletions
diff --git a/scripts/netcfg b/scripts/netcfg index e6de3bd..f286796 100755 --- a/scripts/netcfg +++ b/scripts/netcfg @@ -20,8 +20,8 @@ usage() echo "-a, all-down Take all active profiles down" echo "-c, check-iface Do not start profile if interface is already up" echo "-d, down Take specified profile down" + echo "-D, iface-down Take down profile active on specified interface" echo "-h, help This help message" - echo "-i, iface-down Take down profile active on specified interface" echo "-l, list List all available profiles" echo "-r, reconnect Disconnect and reconnect specified profile" echo "-R, iface-recon Reconnect profile active on specified interface" @@ -60,33 +60,32 @@ fi cd / case "$1" in - -c|check-iface|-u|up) CHECK="YES" profile_up "$2";; - clean) - rm "$STATE_DIR/interfaces"/* 2> /dev/null - rm "$STATE_DIR/profiles"/* 2> /dev/null - rm "$STATE_DIR/suspend"/* 2> /dev/null - rm "$STATE_DIR/last_profile" 2> /dev/null - killall wpa_supplicant 2> /dev/null - killall dhcpcd 2> /dev/null - ;; -d|down) profile_down "$2";; - -i|iface-down) + -D|iface-down|-i) # -i is there for backward compatibility (pre 2.7) interface_down "$2";; -a|all-down) all_down;; -r|reconnect) profile_down "$2" profile_up "$2";; - -R|iface-recont) + -R|iface-recon) interface_reconnect "$2";; all-resume) all_resume;; all-suspend) all_suspend;; + clean) + rm "$STATE_DIR/interfaces"/* 2> /dev/null + rm "$STATE_DIR/profiles"/* 2> /dev/null + rm "$STATE_DIR/suspend"/* 2> /dev/null + rm "$STATE_DIR/last_profile" 2> /dev/null + killall wpa_supplicant 2> /dev/null + killall dhcpcd 2> /dev/null + ;; -*|--*) usage exit 1;; diff --git a/scripts/netcfg-wpa_actiond b/scripts/netcfg-wpa_actiond index f276ab2..43f7183 100755 --- a/scripts/netcfg-wpa_actiond +++ b/scripts/netcfg-wpa_actiond @@ -18,7 +18,7 @@ case $1 in [[ -z $2 ]] && echo "Please specify an interface to stop" && exit 1 interface=$2 [[ -f "$IFACE_DIR/$interface" ]] && source "$IFACE_DIR/$interface" - netcfg -i "$interface" + netcfg -D "$interface" stop_wpa "$interface" kill $(< "/run/wpa_actiond_${2}.pid") # only try to disable software rfkill switches (FS#25514) @@ -43,7 +43,7 @@ fi [[ -f "$IFACE_DIR/$interface" ]] && source "$IFACE_DIR/$interface" if [[ -f "$CONN_DIR/interfaces/$interface" ]]; then - netcfg -i "$interface" + netcfg -D "$interface" fi if [[ -n "$RFKILL" ]]; then # Enable radio if necessary |