summaryrefslogtreecommitdiffstats
path: root/src/connections
diff options
context:
space:
mode:
authorJim Pryor <profjim@jimpryor.net>2009-08-26 02:18:50 +0200
committerJames Rayner <james@archlinux.org>2009-09-07 12:19:46 +0200
commit0cd7101bb61df258b35283b33e4055139b34bc40 (patch)
treef79bdf42d17da1067114f9137e7d7bc8b21895e9 /src/connections
parent812fdb207b88d7f0bfd022641873d00b66d9071b (diff)
downloadnetctl-0cd7101bb61df258b35283b33e4055139b34bc40.tar.gz
netctl-0cd7101bb61df258b35283b33e4055139b34bc40.tar.xz
quotes around $(...) where needed
Signed-off-by: Jim Pryor <profjim@jimpryor.net>
Diffstat (limited to 'src/connections')
-rw-r--r--src/connections/ethernet4
-rw-r--r--src/connections/ethernet-iproute2
-rw-r--r--src/connections/ppp2
3 files changed, 4 insertions, 4 deletions
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"