From 31e93b8f059615db03c3320e8740ea31e03f19a6 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Sun, 3 Jun 2007 16:46:57 +0000
Subject: netbase: Add verbose examples for WEP and WPA encrytion to
 /etc/network/interfaces

---
 packages/netbase/netbase/interfaces | 34 ++++++++++++++++++++++++++++++++--
 packages/netbase/netbase_4.21.bb    |  2 +-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces
index fbeb14ffbc..e6a4574aa9 100644
--- a/packages/netbase/netbase/interfaces
+++ b/packages/netbase/netbase/interfaces
@@ -4,10 +4,40 @@
 auto lo
 iface lo inet loopback
 
+
 # Wireless interfaces
+#
+# Example of an unencrypted (no WEP or WPA) wireless connection
+# that connects to any available access point:
+#
 iface wlan0 inet dhcp
-wireless_mode managed
-wireless_essid any
+	wireless_mode managed
+	wireless_essid any
+#
+#
+# Same as above but locked to a specific access point:
+#
+#iface wlan0 inet dhcp  
+#	wireless_mode managed
+#	wireless-essid some-essid
+#
+# A WEP encrypted connection locked to a specific access point:
+#
+#iface wlan0 inet dhcp  
+#	wireless-essid some-essid
+#	wireless-key s:My-PlainText-Password
+#	wireless-mode managed                  
+#
+# A WPA 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.
+#
+#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             
+
 iface atml0 inet dhcp
 
 # Wired or wireless interfaces
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index 53c9f3d17c..ba5d95b287 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 = "r16"
+PR = "r17"
 
 inherit update-rc.d
 
-- 
cgit v1.2.3