Update and re-arrange examples, update wireless quirk options, stop

using deprecated sys interface

15 files changed, 23 insertions, 53 deletions

diff --git a/examples/deprecated/ethernet-static.example b/examples/deprecated/ethernet-static.example
deleted file mode 100644
index b50cf36..0000000
--- a/examples/deprecated/ethernet-static.example
+++ /dev/null
@@ -1,8 +0,0 @@
-CONNECTION="ethernet"
-DESCRIPTION="A less basic ethernet profile, using static configuration"
-INTERFACE=eth0
-IP="static"
-IFOPTS="192.168.1.23 netmask 255.255.255.0 broadcast 192.168.1.255"
-GATEWAY="192.168.1.1"
-DNS1=192.168.1.1
-DNS2=dns1.dreamhost.com
diff --git a/examples/deprecated/ethernet.example b/examples/deprecated/ethernet.example
deleted file mode 100644
index 2db6072..0000000
--- a/examples/deprecated/ethernet.example
+++ /dev/null
@@ -1,5 +0,0 @@
-CONNECTION="ethernet"
-DESCRIPTION="A very basic ethernet profile, using dhcp"
-INTERFACE=eth0
-IP="dhcp"
-DHCP_TIMEOUT=10
diff --git a/examples/deprecated/wep-static.example b/examples/deprecated/wep-static.example
deleted file mode 100644
index 4474ba7..0000000
--- a/examples/deprecated/wep-static.example
+++ /dev/null
@@ -1,12 +0,0 @@
-CONNECTION="wireless"
-DESCRIPTION="A wep encrypted wireless connection using static ip"
-INTERFACE=wlan0
-SCAN="yes"
-SECURITY="wep"
-ESSID="MyNetwork"
-KEY="1234567890"
-IP="static"
-IFOPTS="192.168.1.23 netmask 255.255.255.0 broadcast 192.168.1.255"
-GATEWAY="192.168.1.1"
-DNS1=192.168.1.1
-DNS2=dns1.dreamhost.com
diff --git a/examples/deprecated/wpa.example b/examples/deprecated/wpa.example
deleted file mode 100644
index f165945..0000000
--- a/examples/deprecated/wpa.example
+++ /dev/null
@@ -1,8 +0,0 @@
-CONNECTION="wireless"
-INTERFACE=wlan0
-SCAN="yes"
-SECURITY="wpa"
-ESSID="mynetwork"
-KEY="SomePasskey"
-IP="dhcp"
-TIMEOUT=20
diff --git a/examples/ethernet-dhcp b/examples/ethernet-dhcp
new file mode 100644
index 0000000..78edfc4
--- /dev/null
+++ b/examples/ethernet-dhcp
@@ -0,0 +1,4 @@
+CONNECTION="ethernet-iproute"
+DESCRIPTION="A basic dhcp ethernet connection using iproute"
+INTERFACE="eth0"
+IP="dhcp"
diff --git a/examples/ethernet-dhcp.example b/examples/ethernet-dhcp.example
deleted file mode 100644
index 6f80a9e..0000000
--- a/examples/ethernet-dhcp.example
+++ /dev/null
@@ -1,3 +0,0 @@
-CONNECTION="ethernet-iproute"
-INTERFACE="eth0"
-IP="dhcp"
diff --git a/examples/ethernet-iproute.example b/examples/ethernet-iproute
index a368707..6ac20e1 100755
--- a/examples/ethernet-iproute.example
+++ b/examples/ethernet-iproute
@@ -1,4 +1,5 @@
 CONNECTION="ethernet-iproute"
+DESCRIPTION="A more versatile static ethernet connection using iproute"
 INTERFACE="eth0"
 IP="static"
 # Any valid iproute command can be placed in this array
diff --git a/examples/ethernet-static.example b/examples/ethernet-static
index ad0c9b4..50756bc 100644
--- a/examples/ethernet-static.example
+++ b/examples/ethernet-static
@@ -1,4 +1,5 @@
 CONNECTION="ethernet-iproute"
+DESCRIPTION="A basic static ethernet connection using iproute"
 INTERFACE="eth0"
 IP="static"
 ADDR="192.168.1.23"
diff --git a/examples/loopback.example b/examples/loopback.example
deleted file mode 100644
index e9dcca9..0000000
--- a/examples/loopback.example
+++ /dev/null
@@ -1,5 +0,0 @@
-CONNECTION="ethernet"
-DESCRIPTION="A very basic ethernet profile, using dhcp"
-INTERFACE=lo
-IP="static"
-IFOPTS="127.0.0.1"
diff --git a/examples/ppp.example b/examples/ppp
index ca8d167..ca8d167 100644
--- a/examples/ppp.example
+++ b/examples/ppp
diff --git a/examples/wireless-dbus b/examples/wireless-dbus
new file mode 100644
index 0000000..7c00349
--- /dev/null
+++ b/examples/wireless-dbus
@@ -0,0 +1,7 @@
+CONNECTION="wireless-dbus"
+DESCRIPTION="A simple WPA connection using wpa_supplicant via dbus"
+INTERFACE="wlan0"
+SECURITY="wpa"
+ESSID="MyNetwork"
+KEY="Wireless Key"
+IP="dhcp"
diff --git a/examples/deprecated/wep.example b/examples/wireless-wep
index 4dad0e1..ed670d0 100644
--- a/examples/deprecated/wep.example
+++ b/examples/wireless-wep
@@ -1,7 +1,6 @@
 CONNECTION="wireless"
 DESCRIPTION="A simple WEP encrypted wireless connection"
-INTERFACE=wlan0
-SCAN="yes"
+INTERFACE="wlan0"
 SECURITY="wep"
 ESSID="MyNetwork"
 KEY="1234567890"
diff --git a/examples/deprecated/wep-string-key.example b/examples/wireless-wep-string-key
index 3118658..42c3210 100644
--- a/examples/deprecated/wep-string-key.example
+++ b/examples/wireless-wep-string-key
@@ -1,8 +1,7 @@
 CONNECTION="wireless"
 DESCRIPTION="A simple WEP encrypted wireless connection"
-INTERFACE=wlan0
-SCAN="yes"
+INTERFACE="wlan0"
 SECURITY="wep"
 ESSID="MyNetwork"
-KEY="s:Some string key"
+KEY="s:Wireless Key"
 IP="dhcp"
diff --git a/examples/wireless-wpa b/examples/wireless-wpa
new file mode 100644
index 0000000..0f5016d
--- /dev/null
+++ b/examples/wireless-wpa
@@ -0,0 +1,7 @@
+CONNECTION="wireless"
+DESCRIPTION="A simple WPA encrypted wireless connection"
+INTERFACE="wlan0"
+SECURITY="wpa"
+ESSID="MyNetwork"
+KEY="WirelessKey"
+IP="dhcp" 
diff --git a/examples/wireless.example b/examples/wireless.example
deleted file mode 100644
index 077d9df..0000000
--- a/examples/wireless.example
+++ /dev/null
@@ -1,7 +0,0 @@
-CONNECTION="wireless-dbus"
-INTERFACE=ipw0
-SECURITY="yes"
-ESSID="Your ESSID"
-KEY="Your Key"
-# Below can be any valid ethernet option. See ethernet-*.example
-IP="dhcp"