7 files changed, 30 insertions, 54 deletions

diff --git a/recipes/adbd/files/adb-init b/recipes/adbd/files/adb-init
index 6faed60..92500d7 100755
--- a/recipes/adbd/files/adb-init
+++ b/recipes/adbd/files/adb-init
@@ -2,25 +2,27 @@
 
 DAEMON=/usr/bin/adbd
 
-VENDOR=0x18d1
-PRODUCT=0x0000
-SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
+. /etc/default/adbd
 
 case "$1" in
 start)
-    modprobe g_ffs idVendor=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL}
-    mkdir -p /dev/usb-ffs
-    chmod 770 /dev/usb-ffs
-    mkdir -p /dev/usb-ffs/adb
-    chmod 770 /dev/usb-ffs/adb
-    mount -t functionfs adb /dev/usb-ffs/adb -o uid=0,gid=0
+    if [ "$USE_ETHERNET" = "no" ]; then
+        modprobe g_ffs idVendor=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL}
+        mkdir -p /dev/usb-ffs
+        chmod 770 /dev/usb-ffs
+        mkdir -p /dev/usb-ffs/adb
+        chmod 770 /dev/usb-ffs/adb
+        mount -t functionfs adb /dev/usb-ffs/adb -o uid=0,gid=0
+    fi
     start-stop-daemon --start --quiet --exec $DAEMON &
     ;;
 stop)
     start-stop-daemon --stop --quiet --exec $DAEMON
-    sleep 1
-    umount /dev/usb-ffs/adb
-    rmmod g_ffs
+    if [ "$USE_ETHERNET" = "no" ]; then
+        sleep 1
+        umount /dev/usb-ffs/adb
+        rmmod g_ffs
+    fi
     ;;
 restart)
     start-stop-daemon --stop --quiet --exec $DAEMON
diff --git a/recipes/adbd/files/defaults b/recipes/adbd/files/defaults
new file mode 100644
index 0000000..d2a3cc0
--- /dev/null
+++ b/recipes/adbd/files/defaults
@@ -0,0 +1,4 @@
+VENDOR=0x18d1
+PRODUCT=0x0000
+SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
+USE_ETHERNET=no
diff --git a/recipes/adbd/files/emulator/adb-init b/recipes/adbd/files/emulator/adb-init
deleted file mode 100755
index 8910e0e..0000000
--- a/recipes/adbd/files/emulator/adb-init
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-DAEMON=/usr/bin/adbd
-
-case "$1" in
-start)
-    start-stop-daemon --start --quiet --exec $DAEMON &
-    ;;
-stop)
-    start-stop-daemon --stop --quiet --exec $DAEMON
-    ;;
-restart)
-    start-stop-daemon --stop --quiet --exec $DAEMON
-    sleep 1
-    start-stop-daemon --start --quiet --exec $DAEMON &
-    ;;
-*)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 1
-esac
-exit 0
diff --git a/recipes/adbd/files/emulator/defaults b/recipes/adbd/files/emulator/defaults
new file mode 100644
index 0000000..0fbba4c
--- /dev/null
+++ b/recipes/adbd/files/emulator/defaults
@@ -0,0 +1,4 @@
+VENDOR=0x18d1
+PRODUCT=0x0000
+SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
+USE_ETHERNET=yes
diff --git a/recipes/adbd/files/imx53qsb/defaults b/recipes/adbd/files/imx53qsb/defaults
new file mode 100644
index 0000000..0fbba4c
--- /dev/null
+++ b/recipes/adbd/files/imx53qsb/defaults
@@ -0,0 +1,4 @@
+VENDOR=0x18d1
+PRODUCT=0x0000
+SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
+USE_ETHERNET=yes
diff --git a/recipes/adbd/files/raspberrypi/adb-init b/recipes/adbd/files/raspberrypi/adb-init
deleted file mode 100644
index 8910e0e..0000000
--- a/recipes/adbd/files/raspberrypi/adb-init
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-DAEMON=/usr/bin/adbd
-
-case "$1" in
-start)
-    start-stop-daemon --start --quiet --exec $DAEMON &
-    ;;
-stop)
-    start-stop-daemon --stop --quiet --exec $DAEMON
-    ;;
-restart)
-    start-stop-daemon --stop --quiet --exec $DAEMON
-    sleep 1
-    start-stop-daemon --start --quiet --exec $DAEMON &
-    ;;
-*)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 1
-esac
-exit 0
diff --git a/recipes/adbd/files/raspberrypi/defaults b/recipes/adbd/files/raspberrypi/defaults
new file mode 100644
index 0000000..0fbba4c
--- /dev/null
+++ b/recipes/adbd/files/raspberrypi/defaults
@@ -0,0 +1,4 @@
+VENDOR=0x18d1
+PRODUCT=0x0000
+SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
+USE_ETHERNET=yes