From 3c010b37d23d655ecad7fc95b52fd91970622beb Mon Sep 17 00:00:00 2001
From: Willer Moreira <willer.moreira@openbossa.org>
Date: Tue, 2 Feb 2010 15:51:44 -0400
Subject: [PATCH 094/118] usbnet: startup usb interface

* Change script to automatically startup usb interface.
* Add mamona modifications

Signed-off-by: Willer Moreira <willer.moreira@openbossa.org>
---
 recipes/mamona/usbnet/usbnet   |   45 ++++++---------------------------------
 recipes/mamona/usbnet_0.1.0.bb |   11 ++-------
 2 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/recipes/mamona/usbnet/usbnet b/recipes/mamona/usbnet/usbnet
index 6b0ac1c..38bf73b 100644
--- a/recipes/mamona/usbnet/usbnet
+++ b/recipes/mamona/usbnet/usbnet
@@ -19,28 +19,16 @@
 
 DESC="USB Networking"
 
-INITFSPATH=/mnt/initfs
 MODULENAME="g_ether"
-MODULEPATH=$INITFSPATH/lib/modules/$(uname -r)/$MODULENAME.ko
-CONFIGPATH=/etc/default/usbnet
+INTERFACE="usb0"
 
 MOUNTPOINT=/media/mmc
 
-LSMOD=/bin/lsmod
-RMMOD=/sbin/rmmod
-INSMOD=/sbin/insmod
 IFUP=/sbin/ifup
 IFDOWN=/sbin/ifdown
 
-test -e "$MODULEPATH" || exit 0
 test -x "$IFUP" || exit 0
 test -x "$IFDOWN" || exit 0
-test -x "$LSMOD" || exit 0
-test -x "$RMMOD" || exit 0
-test -x "$INSMOD" || exit 0
-
-test -r "$CONFIGPATH" && . $CONFIGPATH
-
 
 print_error()
 {
@@ -50,41 +38,22 @@ print_error()
 
 start_usbnet()
 {
-    if $LSMOD | grep -q "$MODULENAME"; then
-        echo "$DESC is already configured."
-        return
-    fi
-
-    echo -n "Starting $DESC: "
+    echo "Starting interface $INTERFACE"
 
-    for f in 1 2; do
-        umount "$MOUNTPOINT$f" > /dev/null 2>&1
-    done
-
-    if ! $INSMOD "$MODULEPATH" > /dev/null 2>&1; then
-        print_error "Error loading $MODULEPATH."
+    if ! $IFUP "$INTERFACE" > /dev/null 2>&1; then
+        print_error "Error startup $INTERFACE."
         return
     fi
 
-    if ! $IFUP -i "$INTERFACE_CONF" usb0 > /dev/null 2>&1; then
-        print_error "Error configuring usb0."
-        return;
-    fi
-
     echo "done."
 }
 
 stop_usbnet()
 {
-    echo -n "Stopping $DESC: "
-
-    if ! $IFDOWN -i "$INTERFACE_CONF" usb0 > /dev/null 2>&1; then
-        print_error "Error deconfiguring usb0."
-        return;
-    fi
+    echo "Stopping interface $INTERFACE"
 
-    if ! $RMMOD "$MODULENAME" > /dev/null 2>&1; then
-        print_error "Error unloading $MODULENAME"
+    if ! $IFUP "$INTERFACE" > /dev/null 2>&1; then
+        print_error "Error to stop $INTERFACE."
         return
     fi
 
diff --git a/recipes/mamona/usbnet_0.1.0.bb b/recipes/mamona/usbnet_0.1.0.bb
index 37c4189..736256f 100644
--- a/recipes/mamona/usbnet_0.1.0.bb
+++ b/recipes/mamona/usbnet_0.1.0.bb
@@ -3,18 +3,16 @@ HOMEPAGE = "http://dev.openbossa.org/trac/mamona/"
 SECTION = "utils"
 LICENSE = "GPL"
 RDEPENDS = "module-init-tools busybox"
-PR = "r1"
+PR = "r2"
 
 PACKAGES = "${PN}"
 
-SRC_URI = 	"file://usbnet \
-             file://default/usbnet \
-             file://interfaces.usbnet"
+SRC_URI = "file://usbnet"
 
 inherit update-rc.d
 
 INITSCRIPT_NAME = "usbnet"
-INITSCRIPT_PARAMS = "defaults"
+INITSCRIPT_PARAMS = "defaults 99"
 
 # Skipping...
 do_configure () {
@@ -30,9 +28,6 @@ do_compile () {
 
 do_install () {
     install -d ${D}${sysconfdir}/init.d
-    install -d ${D}${sysconfdir}/default
     install -d ${D}${sysconfdir}/network
     install -m 0755 ${WORKDIR}/usbnet ${D}${sysconfdir}/init.d
-    install -m 0644 ${WORKDIR}/default/usbnet ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/interfaces.usbnet ${D}${sysconfdir}/network
 }
-- 
1.6.3.3