summaryrefslogtreecommitdiffstats
path: root/src/connections/ethernet
diff options
context:
space:
mode:
authorJim Pryor <profjim@jimpryor.net>2009-09-14 05:43:48 +0200
committerJames Rayner <james@archlinux.org>2009-09-14 08:27:36 +0200
commit57bed3df9310db328d80b32b31fdefa8418bbd1e (patch)
tree29a1b3e4e3a0a2ea886cc12353869aad5f5eb34c /src/connections/ethernet
parenta02e1e0dea5172d6eb55b8e99428b5ad386d3d66 (diff)
downloadnetctl-57bed3df9310db328d80b32b31fdefa8418bbd1e.tar.gz
netctl-57bed3df9310db328d80b32b31fdefa8418bbd1e.tar.xz
Rename set_interface to bring_interface
3. Change the name of "set_interface up/down..." to "bring_interface up/down" to differentiate it from the similarly-named, merely record-keeping functions. Signed-off-by: Jim Pryor <profjim@jimpryor.net>
Diffstat (limited to 'src/connections/ethernet')
-rw-r--r--src/connections/ethernet8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/connections/ethernet b/src/connections/ethernet
index 8e34327..e24cc3e 100644
--- a/src/connections/ethernet
+++ b/src/connections/ethernet
@@ -12,7 +12,7 @@ ethernet_up() {
fi
report_debug ethernet_up ifup
- set_interface up-old "$INTERFACE"
+ bring_interface up-old "$INTERFACE"
# don't think it's possible to detect carrier using ifconfig alone (at least, not without ifdown/ifupping the interface)
if [[ $(cat "/sys/class/net/$INTERFACE/carrier" 2>/dev/null) -ne 1 ]]; then # gives err if iface inactive (i.e. ifdown)
@@ -32,7 +32,7 @@ ethernet_up() {
if ! wpa_check "$INTERFACE"; then
# ignore quirk nodown---is that appropriate?
# this adds a flush call as well---is that appropriate?
- set_interface forcedown-old "$INTERFACE"
+ bring_interface forcedown-old "$INTERFACE"
report_fail "WPA Authentication/Association Failed"
return 1
fi
@@ -79,7 +79,7 @@ ethernet_up() {
# JP: don't we want to add this to all the aborts?
# ignore quirk nodown---is that appropriate?
# this adds a flush call as well---is that appropriate?
- set_interface forcedown-old "$INTERFACE"
+ bring_interface forcedown-old "$INTERFACE"
report_fail "Adding gateway $GATEWAY failed."
return 1
fi
@@ -145,7 +145,7 @@ ethernet_down() {
report_debug ethernet_down ifdown
# ignore quirk nodown---is that appropriate?
# this adds a flush call as well---is that appropriate?
- set_interface forcedown-old "$INTERFACE"
+ bring_interface forcedown-old "$INTERFACE"
}
# Returns status of profile - is it still functional?