[SCM] debian-live/config-webc branch, master, updated. 28206f0f72c326a40746278a47c8aa9a24a09004

[Kai Hendry]

The following commit has been merged in the master branch:
commit 28206f0f72c326a40746278a47c8aa9a24a09004
Author: Kai Hendry <hendry at iki.fi>
Date:   Thu Oct 20 18:28:23 2011 +0200

    If e1000e comes up as eth1, try allow it to come online with hotplug

diff --git a/webconverger/config/includes.chroot/etc/network/interfaces b/webconverger/config/includes.chroot/etc/network/interfaces
index 3cc5b33..d8618a1 100644
--- a/webconverger/config/includes.chroot/etc/network/interfaces
+++ b/webconverger/config/includes.chroot/etc/network/interfaces
@@ -6,17 +6,20 @@ auto lo
 iface lo inet loopback
 
 # The primary network interface
-allow-hotplug eth0
+allow-hotplug eth0 eth1
 iface eth0 inet dhcp
 	pre-up iptables-restore < /etc/iptables.conf
 
-# The wireless network interface (dhcp)
-iface wlan0 inet dhcp
+# Can be either fixed or wireless
+iface eth1 inet dhcp
 	pre-up iptables-restore < /etc/iptables.conf
-    wpa-driver wext
-    wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
+	wpa-driver wext
+	wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
 
-iface eth1 inet dhcp
+# The wireless network interface
+iface wlan0 inet dhcp
 	pre-up iptables-restore < /etc/iptables.conf
-    wpa-driver wext
-    wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
+	wpa-driver wext
+	wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
+
+

-- 
debian-live/config-webc