summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2007-12-26 14:30:12 +0000
committerMatthias Hentges <oe@hentges.net>2007-12-26 14:30:12 +0000
commitb8f3e4844b685d8c7b395333672f53b23cf10b3d (patch)
tree34ccdc1de4210f86a08cd947716018f81da42591
parentd43361883fd0df1cf41021d754fdd0edd73e0e56 (diff)
netbase: Update /e/n/interfaces to include new WPA example configuration. Closing bug #3567.
-rw-r--r--packages/netbase/netbase/interfaces17
-rw-r--r--packages/netbase/netbase_4.21.bb2
2 files changed, 14 insertions, 5 deletions
diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces
index ca449168a9..c615642e35 100644
--- a/packages/netbase/netbase/interfaces
+++ b/packages/netbase/netbase/interfaces
@@ -29,14 +29,23 @@ iface wlan0 inet dhcp
# wireless-mode managed
#
# A WPA1 or WPA2 encrypted connection locked to a specific access point.
-# The WLAN cards firmware is updated temporarily to allow WPA
-# connections. Your card may or may not need the update.
+# This is the best option for non-roaming, single-network usage.
+# Note that your card may require a firmware update to use WPA.
+# Some distributions install a temporary volatile firmware update on ifup.
#
#iface wlan0 inet dhcp
# wpa-essid some-essid
# wpa-psk My-PlainText-Password
-# pre-up iwpriv wlan0 reset 1
-# pre-up prism2_srec -r wlan0 /etc/pcmcia/rf010804.hex
+#
+# A WPA1 or WPA2 encrypted connection using an external configuration file
+# for wpa-supplicant. This is the way to go if you need to configure multiple
+# networks with different keys and / or WPA settings and roaming support.
+#
+# iface wlan0 inet dhcp
+# wpa-conf /etc/wpa_supplicant.conf
+# wpa-driver hostap
+
+
iface atml0 inet dhcp
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index 82464d82c6..1f2837a8c1 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
infrastructure for basic TCP/IP based networking."
SECTION = "base"
LICENSE = "GPL"
-PR = "r25"
+PR = "r26"
inherit update-rc.d