From 3585de05ce567519edd08d11d1bbbdc672eb1007 Mon Sep 17 00:00:00 2001
From: Michel-FK <michel.stempin@funkey-project.com>
Date: Sun, 1 Nov 2020 00:42:12 +0100
Subject: [PATCH] force usbnet in Recovery

Signed-off-by: Michel-FK <michel.stempin@funkey-project.com>
---
 Recovery/board/funkey/rootfs-overlay/etc/init.d/S40network   | 2 +-
 Recovery/board/funkey/rootfs-overlay/etc/init.d/S41dhcpcd    | 2 +-
 Recovery/board/funkey/rootfs-overlay/etc/init.d/S50dropbear  | 2 +-
 .../board/funkey/rootfs-overlay/usr/local/sbin/usb_gadget    | 5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S40network b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S40network
index f7e45a4..9ca42ae 100755
--- a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S40network
+++ b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S40network
@@ -5,7 +5,7 @@
 
 # Debian ifupdown needs the /run/network lock directory
 mkdir -p /run/network
-[ -f /mnt/usbnet ] || exit 0
+#[ -f /mnt/usbnet ] || exit 0
 case "$1" in
   start)
 	printf "Starting network: "
diff --git a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S41dhcpcd b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S41dhcpcd
index 05e01b3..98965aa 100755
--- a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S41dhcpcd
+++ b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S41dhcpcd
@@ -6,7 +6,7 @@
 DAEMON=/sbin/dhcpcd
 CONFIG=/etc/dhcpcd.conf
 PIDFILE=/var/run/dhcpcd.pid
-[ -f /mnt/usbnet ] || exit 0
+#[ -f /mnt/usbnet ] || exit 0
 [ -f $CONFIG ] || exit 0
 
 case "$1" in
diff --git a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S50dropbear b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S50dropbear
index 7314588..6ac1711 100755
--- a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S50dropbear
+++ b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S50dropbear
@@ -3,7 +3,7 @@
 # Starts dropbear sshd.
 #
 
-[ -f /mnt/usbnet ] || exit 0
+#[ -f /mnt/usbnet ] || exit 0
 # Allow a few customizations from a config file
 test -r /etc/default/dropbear && . /etc/default/dropbear
 
diff --git a/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/usb_gadget b/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/usb_gadget
index b43b24b..93d1b4a 100755
--- a/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/usb_gadget
+++ b/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/usb_gadget
@@ -9,9 +9,8 @@ source /usr/local/lib/utils
 # The composite gadget directory
 GADGET=/sys/kernel/config/usb_gadget/FunKey
 
-# Check if Ethernet over USB network is requested
-[ ! -f /mnt/usbnet ]
-USBNET=${?}
+# Force Ethernet over USB network for Recovery
+USBNET=1
 
 # USB VID for Linux Foundation
 ID_VENDOR="0x1d6b"