merge r2193

svn path=/baselayout-vserver/branches/baselayout-1_12/; revision=415

5 files changed, 24 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index a520705..b72d978 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for Gentoo System Intialization ("rc") scripts
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
 
+  16 Aug 2006; Roy Marples <uberlord@gentoo.org>:
+
+    Fix typo's in net.example, #144144 thanks to Christian 'Opfer' Faulhammer.
+
+    /sys/class/net/$iface/wireless means it's a wireless device too in
+    iwconfig.sh and wpa_supplicant.sh
+
   15 Aug 2006; Roy Marples <uberlord@gentoo.org>:
 
     Fix start-stop-daemon using the --name option
diff --git a/etc/conf.d/rc b/etc/conf.d/rc
index ce80915..eca8448 100644
--- a/etc/conf.d/rc
+++ b/etc/conf.d/rc
@@ -71,7 +71,7 @@ RC_VERBOSE="no"
 RC_BOOTLOG="no"
 
 # Set to "yes" if you want to benchmark system boot with bootchart.
-# You'll need to emerge the apps-benchmark/bootchart package for this to work.
+# You'll need to emerge the app-benchmarks/bootchart package for this to work.
 
 RC_BOOTCHART="no"
 
diff --git a/net-scripts/conf.d/net.example b/net-scripts/conf.d/net.example
index 7f789b1..1e5e416 100644
--- a/net-scripts/conf.d/net.example
+++ b/net-scripts/conf.d/net.example
@@ -79,14 +79,14 @@
 #	"192.168.0.3/24"
 #	"192.168.0.4/24"
 #)
-# Or you can use sequence expresions
+# Or you can use sequence expressions
 #config_eth0=( "192.168.0.{2..4}/24" )
 # which does the same as above. Be careful though as if you use this and
 # fallbacks, you have to ensure that both end up with the same number of
 # values otherwise your fallback won't work correctly.
 
 # You can also use IPv6 addresses
-# (you should always specficy a prefix length with IPv6 here)
+# (you should always specify a prefix length with IPv6 here)
 #config_eth0=(
 #	"192.168.0.2/24"
 #	"4321:0:1:2:3:4:567:89ab/64"
@@ -103,7 +103,7 @@
 # If you don't want ANY address (only useful when calling for advanced stuff)
 #config_eth0=( "null" )
 
-# Here's how todo routing if you need it
+# Here's how to do routing if you need it
 #routes_eth0=(
 #	"default via 192.168.0.1"		# IPv4 default route
 #	"10.0.0.0/8 via 192.168.0.1"		# IPv4 subnet route
@@ -182,7 +182,7 @@
 # as domain and search are mutually exclusive.
 
 # You can also override any settings found here per MAC address of the AP
-# incase you use Access Points with the same ESSID but need different
+# in case you use Access Points with the same ESSID but need different
 # networking configs. Below is an example - of course you use the same
 # method with other variables
 #mac_config_001122334455=( "dhcp" )
@@ -267,7 +267,7 @@
 #
 # This is a module that tries to find a gateway IP. If it exists then we use
 # that gateways configuration for our own. For the configuration variables
-# simply ensure that each ocet is zero padded and the dots are removed.
+# simply ensure that each octet is zero padded and the dots are removed.
 # Below is an example.
 #
 #gateways_eth0="192.168.0.1 10.0.0.1"
@@ -337,7 +337,7 @@
 # NOTE: Vlans are controlled by their physical interface and not per vlan
 # This means you do not need to create init scripts in /etc/init.d for each
 # vlan, you must need to create one for the physical interface.
-# If you wish to control the configuration of each vlan through a seperate
+# If you wish to control the configuration of each vlan through a separate
 # script, or wish to rename the vlan interface to something that vconfig
 # cannot then you need to do this.
 #vlan_start_eth0="no"
@@ -512,10 +512,10 @@
 # For changing MAC addresses using the below, emerge net-analyzer/macchanger
 # - to randomize the last 3 bytes only
 #mac_eth0="random-ending"
-# - to randomize between the same physical type of connection (eg fibre,
+# - to randomize between the same physical type of connection (e.g. fibre,
 # copper, wireless) , all vendors
 #mac_eth0="random-samekind"
-# - to randomize between any physical type of connection (eg fibre, copper,
+# - to randomize between any physical type of connection (e.g. fibre, copper,
 # wireless) , all vendors
 #mac_eth0="random-anykind"
 # - full randomization - WARNING: some MAC addresses generated by this may NOT
@@ -588,7 +588,7 @@
 # You have to specify a VPI and VCI for the interface like so
 #br2684ctl_nas0="-a 0.38" # UK VPI and VCI
 
-# You may want to configure the encapulation method as well by adding the -e
+# You may want to configure the encapsulation method as well by adding the -e
 # option to the command above (may need to be before the -a command)
 # -e 0 # LLC (default)
 # -e 1 # VC mux
@@ -676,7 +676,7 @@
 # You can disable them both with the generic plug
 #modules_eth0=( "!plug" )
 
-# To use specific ifplugd options, fex specifying wiress mode
+# To use specific ifplugd options, fex specifying wireless mode
 #ifplugd_eth0="--api-mode=wlan"
 # man ifplugd for more options
 
@@ -810,7 +810,7 @@
 # The Big Fat Warning :- If you use module forcing do not complain to us or
 # file bugs about it not working!
 #
-# Loading modules is a slow afair - we have to check each one for the following
+# Loading modules is a slow affair - we have to check each one for the following
 # 1) Code sanity
 # 2) Has the required package been emerged?
 # 3) Has it modified anything?
@@ -818,7 +818,7 @@
 
 # Then we have to strip out the conflicting modules based on user preference
 # and default configuration and sort them into the correct order.
-# Finally we check the end result for dependancies.
+# Finally we check the end result for dependencies.
 
 # This, of course, takes valuable CPU time so we provide module forcing as a
 # means to speed things up. We still do *some* checking but not much.
diff --git a/net-scripts/net/iwconfig.sh b/net-scripts/net/iwconfig.sh
index fcf9ed2..cec2f9c 100644
--- a/net-scripts/net/iwconfig.sh
+++ b/net-scripts/net/iwconfig.sh
@@ -60,7 +60,8 @@ iwconfig_check_installed() {
 # Checks to see if wireless extensions are enabled on the interface
 iwconfig_exists() {
 	# Support new sysfs layout
-	[[ -L /sys/class/net/$1/wiphy ]] && return 0
+	[[ -L /sys/class/net/$1/wiphy || -d /sys/class/net/$1/wireless ]] \
+		&& return 0
 
 	[[ ! -e /proc/net/wireless ]] && return 1
 	[[ $(</proc/net/wireless) =~ $'\n'"[ \t]*$1:" ]]
diff --git a/net-scripts/net/wpa_supplicant.sh b/net-scripts/net/wpa_supplicant.sh
index b556020..eeba1f9 100644
--- a/net-scripts/net/wpa_supplicant.sh
+++ b/net-scripts/net/wpa_supplicant.sh
@@ -57,7 +57,8 @@ wpa_supplicant_check_installed() {
 # Checks to see if wireless extensions are enabled on the interface
 wpa_supplicant_exists() {
 	# Support new sysfs layout
-	[[ -L /sys/class/net/$1/wiphy ]] && return 0
+	[[ -L /sys/class/net/$1/wiphy || -d /sys/class/net/$1/wireless ]] \
+		&& return 0
 	
 	[[ ! -e /proc/net/wireless ]] && return 1
 	grep -q "^[ \t]*$1:" /proc/net/wireless