[oe-commits] Martin Dietze : nylon: fixed the names of default wlan devices.

[git at git.openembedded.org]

Module: openembedded.git
Branch: mdietze/nylon
Commit: e2c6cadfa26868cab88af89acab4071b94e30153
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=e2c6cadfa26868cab88af89acab4071b94e30153

Author: Martin Dietze <mdietze at gmail.com>
Date:   Sat Mar  2 17:57:09 2013 +0100

nylon: fixed the names of default wlan devices.

---

 recipes/nylon/nylon-config.bb      |    2 +-
 recipes/nylon/nylon-scripts_cvs.bb |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes/nylon/nylon-config.bb b/recipes/nylon/nylon-config.bb
index d164818..5094aa9 100644
--- a/recipes/nylon/nylon-config.bb
+++ b/recipes/nylon/nylon-config.bb
@@ -31,7 +31,7 @@ ln -s /etc/ppp/resolv.conf /etc/resolv.conf
 update-rc.d factorydefaults start 90 2 .
 
 # "fix" /etc/network/interfaces
-perl -I /srv/www/cgi-bin -MConfig::IFace -e '$w=new Config::IFace(); $v = $w->read(); $v->{auto} = {0=>"lo",1=>eth0,2=>"wlan0",3=>"wlan1",4=>"ath0",5=>"ath1"}; $w->write($v)'
+perl -I /srv/www/cgi-bin -MConfig::IFace -e '$w=new Config::IFace(); $v = $w->read(); $v->{auto} = {0=>"lo",1=>eth0,2=>"wlan0",3=>"wlan1"}; $w->write($v)'
 
 update-rc.d busybox-httpd start 40 2 3 4 5 .
 /etc/init.d/busybox-httpd stop || true
diff --git a/recipes/nylon/nylon-scripts_cvs.bb b/recipes/nylon/nylon-scripts_cvs.bb
index 63946a0..8299282 100644
--- a/recipes/nylon/nylon-scripts_cvs.bb
+++ b/recipes/nylon/nylon-scripts_cvs.bb
@@ -13,7 +13,8 @@ RDEPENDS = "bash"
 SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz \
 	file://firewall-bash.diff;patch=1 \
 	file://wireless-acl-bash.diff;patch=1 \
-	file://wireless-extras-bash.diff;patch=1"
+	file://wireless-extras-bash.diff;patch=1 \
+	file://ath-to-wlan.diff;patch=1"
 S = "${WORKDIR}/${PN}"
 INHIBIT_PACKAGE_STRIP = "1"