diff options
| author | Jouke Witteveen <j.witteveen@gmail.com> | 2012-04-09 13:31:30 +0200 |
|---|---|---|
| committer | Jouke Witteveen <j.witteveen@gmail.com> | 2012-04-09 13:31:30 +0200 |
| commit | c6ad0bd1294bddb78d1b47e48e8ce7657f91e1df (patch) | |
| tree | 0229de9d540208fb34c46e28b8f04df7aa12c302 | |
| parent | e65fad9b3aa4ce25fda0b6a79395025efbae4416 (diff) | |
| download | netctl-c6ad0bd1294bddb78d1b47e48e8ce7657f91e1df.tar.gz netctl-c6ad0bd1294bddb78d1b47e48e8ce7657f91e1df.tar.xz | |
Minor changes
| -rw-r--r-- | docs/features.txt | 9 | ||||
| -rw-r--r-- | src/connections/wireless | 1 | ||||
| -rw-r--r-- | src/network | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/docs/features.txt b/docs/features.txt index 17fcd8a..f07376f 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -36,17 +36,16 @@ For more options, see ''netcfg help'' Start a specific list of profiles on boot ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -net-profiles allows you to start some profiles on boot. Specify the +net-profiles allows you to start some profiles at boot time. Specify the profiles you want netcfg to start (in this order) in the +NETWORKS+ line -in '/etc/conf.d/netcfg'. Prefix a profile with a @ to start it in the +in '/etc/conf.d/netcfg'. Prefix a profile with a `@' to start it in the background. For example: -------------------------------- NETWORKS=(@adsl @mywireless lan) -------------------------------- -To run on boot, add `net-profiles' to your +DAEMONS+ line in -'/etc/rc.conf'. +Next, add `net-profiles' to your +DAEMONS+ line in '/etc/rc.conf'. Wireless automatic connection and roaming support @@ -57,7 +56,7 @@ event, netcfg now has automatic connection and roaming support. To use this: . Install core/wpa_actiond -. In '/etc/rc.conf' set +WIRELESS_INTERFACE+ to your wireless interface, eg: +. In '/etc/conf.d/netcfg' set +WIRELESS_INTERFACE+ to your wireless interface, eg: + --------------------------- WIRELESS_INTERFACE="wlan0" diff --git a/src/connections/wireless b/src/connections/wireless index a5b7ad2..44a25b4 100644 --- a/src/connections/wireless +++ b/src/connections/wireless @@ -4,7 +4,6 @@ . "$SUBR_DIR/rfkill" wireless_up() { - PROFILE="$1" load_profile "$PROFILE" diff --git a/src/network b/src/network index 5823411..30f9e89 100644 --- a/src/network +++ b/src/network @@ -1,6 +1,6 @@ ### Globals . /usr/lib/network/globals -# will load hooks and they in turn will load /etc/rc.d/functions if they need to +# will load hooks ## Loads a profile. # $1: profile name @@ -273,7 +273,6 @@ interface_down() esac } - # interface_reconnect interface # reconnects the profile active on interface interface_reconnect() @@ -290,7 +289,6 @@ interface_reconnect() esac } - ## # check_iface interface # Return 0 if interface unavailable (in use by a profile or externally, or disabled) @@ -356,7 +354,6 @@ set_iface() { fi } - is_interface() { local INTERFACE="$1" if [[ ! -e "/sys/class/net/$INTERFACE" ]]; then @@ -394,4 +391,3 @@ bring_interface() } # vim: ft=sh ts=4 et sw=4: - |