diff options
| author | Jim Pryor <profjim@jimpryor.net> | 2009-08-11 14:05:16 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-08-15 04:28:31 +0200 |
| commit | 09a2212f344e5bdf7573584a9b8ef5b64c7b1fac (patch) | |
| tree | ea813dcebf776401161a6fc3b4761710b2a0d2e2 /src/connections/ethernet-iproute | |
| parent | 07aa8f784896ba97914f4b2a71d2ba6c0047cb07 (diff) | |
| download | netctl-09a2212f344e5bdf7573584a9b8ef5b64c7b1fac.tar.gz netctl-09a2212f344e5bdf7573584a9b8ef5b64c7b1fac.tar.xz | |
quotes!
Signed-off-by: Jim Pryor <profjim@jimpryor.net>
Diffstat (limited to 'src/connections/ethernet-iproute')
| -rw-r--r-- | src/connections/ethernet-iproute | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/connections/ethernet-iproute b/src/connections/ethernet-iproute index c50fd7d..385e128 100644 --- a/src/connections/ethernet-iproute +++ b/src/connections/ethernet-iproute @@ -9,9 +9,9 @@ report_iproute() } ethernet_up() { - load_profile $1 + load_profile "$1" - if [[ ! -e /sys/class/net/$INTERFACE ]]; then + if [[ ! -e "/sys/class/net/$INTERFACE" ]]; then if ! echo "$INTERFACE" | fgrep -q ":"; then report_iproute "Interface $INTERFACE does not exist" fi @@ -24,8 +24,8 @@ ethernet_up() { report_iproute "No connection" fi - if checkyesno ${AUTH8021X:-no}; then - . ${SUBR_DIR}/8021x + if checkyesno "${AUTH8021X:-no}"; then + . "${SUBR_DIR}/8021x" [[ -z "$WPA_CONF" ]] && WPA_CONF="/etc/wpa_supplicant.conf" [[ -z "$WPA_OPTS" ]] && WPA_OPTS="-Dwired" @@ -44,10 +44,10 @@ ethernet_up() { fi fi - case $IP in + case "$IP" in dhcp) # Clear remaining pid files. - rm -f /var/run/dhcpcd-${INTERFACE}.{pid,cache} >/dev/null 2>&1 + rm -f "/var/run/dhcpcd-${INTERFACE}".{pid,cache} >/dev/null 2>&1 # If using own dns, tell dhcpcd to NOT replace resolv.conf [[ -n "$DNS" ]] && DHCP_OPTIONS="-C resolv.conf $DHCP_OPTIONS" @@ -61,13 +61,13 @@ ethernet_up() { static) if [[ -n "$ADDR" ]]; then report_debug ethernet_iproute_up ip addr add "$ADDR/24" brd + dev "$INTERFACE" - if ! ip addr add ${ADDR}/24 brd + dev $INTERFACE; then + if ! ip addr add "${ADDR}/24" brd + dev "$INTERFACE"; then report_iproute "Could not configure interface" fi fi if [[ -n "$GATEWAY" ]]; then report_debug ethernet_iproute_up ip route add default via "$GATEWAY" - if ! ip route add default via $GATEWAY; then + if ! ip route add default via "$GATEWAY"; then report_iproute "Adding gateway $GATEWAY failed" fi fi @@ -90,7 +90,7 @@ ethernet_up() { # Set hostname if [[ -n "$HOSTNAME" ]]; then report_debug ethernet_iproute_up hostname "$HOSTNAME" - if ! hostname $HOSTNAME; then + if ! hostname "$HOSTNAME"; then report_iproute "Cannot set hostname" fi fi @@ -102,7 +102,7 @@ ethernet_up() { [[ -n "$SEARCH" ]] && echo "search $SEARCH" >>/etc/resolv.conf if [[ -n "$DNS" ]]; then - for dns in ${DNS[@]}; do + for dns in "${DNS[@]}"; do echo "nameserver $dns" >>/etc/resolv.conf done fi @@ -111,10 +111,10 @@ ethernet_up() { } ethernet_down() { - load_profile $1 + load_profile "$1" if [[ "$IP" == "dhcp" ]]; then - if [[ -f /var/run/dhcpcd-${INTERFACE}.pid ]]; then + if [[ -f "/var/run/dhcpcd-${INTERFACE}.pid" ]]; then report_debug ethernet_iproute_down dhcpcd -qx "$INTERFACE" dhcpcd -qx "$INTERFACE" &>/dev/null fi @@ -134,6 +134,6 @@ ethernet_status() { fi } -ethernet_$1 $2 +ethernet_$1 "$2" exit $? # vim: set ts=4 et sw=4: |