[oe-commits] Angus Ainslie : initscripts : more g_ether tweaks

[GIT User account]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: 5003ee8222bf7ee0c65e0363e3cf8533eb67034f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5003ee8222bf7ee0c65e0363e3cf8533eb67034f

Author: Angus Ainslie <nytowl at openmoko.org>
Date:   Wed May 13 10:24:02 2009 -0600

initscripts : more g_ether tweaks

---

 recipes/initscripts/initscripts-1.0/g_ether.sh |    8 ++------
 recipes/initscripts/initscripts_1.0.bb         |    2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/recipes/initscripts/initscripts-1.0/g_ether.sh b/recipes/initscripts/initscripts-1.0/g_ether.sh
index aad4364..a7bc7bd 100644
--- a/recipes/initscripts/initscripts-1.0/g_ether.sh
+++ b/recipes/initscripts/initscripts-1.0/g_ether.sh
@@ -87,11 +87,7 @@ fi
 [ -d /etc/modprobe.d ] || mkdir /etc/modprobe.d
 echo "options g_ether $daddr $haddr" >/etc/modprobe.d/g_ether.conf
 
-# And now, since this is first boot, we need to probe the module
-modprobe g_ether 2>/dev/null || true
-
-# try to slap the interface into working the first time
-ifdown usb0 || true
-ifup usb0 || true
+# And now, since this is first boot, make sure the module gets probed
+echo "g_ether" > /etc/modutils/g_ether
 
 fi
diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb
index 8b96d89..4398878 100644
--- a/recipes/initscripts/initscripts_1.0.bb
+++ b/recipes/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r114"
+PR = "r115"
 
 SRC_URI = "file://functions \
            file://halt \