summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/8021x2
-rw-r--r--src/connections/ethernet4
-rw-r--r--src/connections/ethernet-iproute2
-rw-r--r--src/connections/ppp2
-rw-r--r--src/netcfg-menu2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/8021x b/src/8021x
index 25c9cc1..bbbbbda 100644
--- a/src/8021x
+++ b/src/8021x
@@ -43,7 +43,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 "/var/run/wpa_supplicant_$1.pid" ]]; then
- kill $(cat "/var/run/wpa_supplicant_$1.pid") &>/dev/null &
+ kill "$(cat "/var/run/wpa_supplicant_$1.pid")" &>/dev/null &
fi
}
diff --git a/src/connections/ethernet b/src/connections/ethernet
index 5985ce5..dd07667 100644
--- a/src/connections/ethernet
+++ b/src/connections/ethernet
@@ -54,7 +54,7 @@ ethernet_up() {
[[ -n "$DNS1" || -n "$DNS" ]] && DHCP_OPTIONS="-C resolv.conf $DHCP_OPTIONS"
# Start dhcpcd
report_debug ethernet_up dhcpcd -qL -t "${DHCP_TIMEOUT:-10}" $DHCP_OPTIONS "$INTERFACE"
- dhcpcd -qL -t "${DHCP_TIMEOUT:-10}" $DHCP_OPTIONS "$INTERFACE" 2>&1 | report_debug $(cat)
+ dhcpcd -qL -t "${DHCP_TIMEOUT:-10}" $DHCP_OPTIONS "$INTERFACE" 2>&1 | report_debug "$(cat)"
if [[ "$PIPESTATUS" -ne 0 ]]; then
report_fail "DHCP IP lease attempt failed."
return 1
@@ -125,7 +125,7 @@ ethernet_down() {
if checkyesno "${DHCLIENT:-no}"; then
if [[ -f "/var/run/dhclient-${INTERFACE}.pid" ]]; then
report_debug ethernet_down kill dhclient
- kill $(cat "/var/run/dhclient-${INTERFACE}.pid")
+ kill "$(cat "/var/run/dhclient-${INTERFACE}.pid")"
fi
else
if [[ -f "/var/run/dhcpcd-${INTERFACE}.pid" ]]; then
diff --git a/src/connections/ethernet-iproute b/src/connections/ethernet-iproute
index f0ac995..b86b9f4 100644
--- a/src/connections/ethernet-iproute
+++ b/src/connections/ethernet-iproute
@@ -54,7 +54,7 @@ ethernet_up() {
[[ -n "$DNS" ]] && DHCP_OPTIONS="-C resolv.conf $DHCP_OPTIONS"
report_debug ethernet_iproute_up dhcpcd -qL -t "${DHCP_TIMEOUT:-10}" $DHCP_OPTIONS "$INTERFACE"
- dhcpcd -qL -t "${DHCP_TIMEOUT:-10}" $DHCP_OPTIONS "$INTERFACE" 2>&1 | report_debug $(cat)
+ dhcpcd -qL -t "${DHCP_TIMEOUT:-10}" $DHCP_OPTIONS "$INTERFACE" 2>&1 | report_debug "$(cat)"
if [[ "$PIPESTATUS" -ne 0 ]]; then
report_iproute "DHCP IP lease attempt failed"
fi
diff --git a/src/connections/ppp b/src/connections/ppp
index c50fee1..ec985d4 100644
--- a/src/connections/ppp
+++ b/src/connections/ppp
@@ -17,7 +17,7 @@ ppp_up() {
ppp_down() {
load_profile "$1"
- kill $(head -1 "/var/run/ppp-$(basename $PEER).pid")
+ kill "$(head -1 "/var/run/ppp-$(basename $PEER).pid")"
}
ppp_$1 "$2"
diff --git a/src/netcfg-menu b/src/netcfg-menu
index b24455c..78367d2 100644
--- a/src/netcfg-menu
+++ b/src/netcfg-menu
@@ -50,7 +50,7 @@ case $ret in
if [[ $ret -eq 0 ]]; then echo "$DEFAULT" > "$STATE_DIR/menu"; fi
;;
0) # User selection
- profile_up $(cat "$ANSWER")
+ profile_up "$(cat "$ANSWER")"
ret=$?
if [[ $ret -eq 0 ]]; then mv "$ANSWER" "$STATE_DIR/menu"; fi
;;