Commit 4e034777 authored by Jouke Witteveen's avatar Jouke Witteveen
Browse files

Minor improvements

After this change, a profile started by a previous version of netcfg can potentially not be brought down anymore. This only concerns the updating process. Running `netcfg clean` should make everything OK again (potentially leaving your network down, but you can now bring up profiles again).
parent 5e6d2bab
......@@ -51,7 +51,7 @@ stop_wpa()
sleep 1 # JP: need this else the file tends to disappear after [[ -f ... ]] but before cat...
# see <http://bbs.archlinux.org/viewtopic.php?pid=515667#p515667>
if [[ -f "/run/wpa_supplicant_$1.pid" ]]; then
kill "$(cat "/run/wpa_supplicant_$1.pid")" &>/dev/null &
kill "$(< "/run/wpa_supplicant_$1.pid")" &>/dev/null &
fi
}
......@@ -173,7 +173,7 @@ wpa_supplicant_scan_info() {
return 1
fi
echo $essids
echo "$essids"
return 0
}
......@@ -203,7 +203,7 @@ make_wpa_config() {
echo "ssid=\"$ESSID\""
;;
hex)
# Hex ESSID is written unquoted ans lowercase (FS#24333)
# Hex ESSID is written unquoted and in lowercase (FS#24333)
echo "ssid=${ESSID,,}"
;;
*)
......@@ -255,4 +255,3 @@ make_wpa_config() {
}
# vim: ft=sh ts=4 et sw=4 tw=0:
......@@ -73,8 +73,7 @@ function exit_fail { report_fail "$*"; exit 1; }
# Return 0 if it's "yes" (et al), nonzero otherwise.
# To default to yes, do: "checkyesno ${VAR:-yes}".
#
checkyesno()
{
function checkyesno() {
local _value="$1"
#debug "checkyesno: $1 is set to $_value."
case "$_value" in
......@@ -89,7 +88,7 @@ checkyesno()
return 1
;;
*)
#warn "\$${1} is not set properly - see ${rcvar_manpage}."
#warn "\$${1} is not set properly - see rc.conf(5)."
return 1
;;
esac
......
......@@ -295,11 +295,8 @@ interface_reconnect()
# Return 1 if interface down and available to be used
#
check_iface() {
if [[ -f "$STATE_DIR/interfaces/$1" ]]; then (
. "$STATE_DIR/interfaces/$1"
echo "$PROFILE" # may be: external, disabled, or a profile name
return 0
)
if [[ -f "$STATE_DIR/interfaces/$1" ]]; then
echo "$(< "$STATE_DIR/interfaces/$1")"
return 0
else
return 1
......@@ -347,7 +344,7 @@ set_profile() {
set_iface() {
local PROFILE="${3:-external}"
if [[ "$1" == "up" ]]; then
echo "PROFILE='$PROFILE'" > "$STATE_DIR/interfaces/$2"
echo "$PROFILE" > "$STATE_DIR/interfaces/$2"
elif [[ "$1" == "down" ]]; then
rm -f "$STATE_DIR/interfaces/$2" # JP: add -f so we don't complain if the interface isn't up
fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment