From 2608241bb67953d2d3d267178617bed7a1fcba3d Mon Sep 17 00:00:00 2001
From: mofeng-git <mofeng654321@hotmail.com>
Date: Sat, 7 Sep 2024 22:16:15 +0800
Subject: [PATCH] fix otg support

---
 build/Dockerfile                    | 3 ++-
 build/v2-hdmiusb-rpi4.override.yaml | 4 ++--
 configs/kvmd/init.sh                | 9 ++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 configs/kvmd/init.sh

diff --git a/build/Dockerfile b/build/Dockerfile
index 22aec048..c22c4c8b 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -83,6 +83,7 @@ COPY build/v2-hdmiusb-rpi4.override.yaml /etc/kvmd/override.yaml
 COPY configs/kvmd/main/v2-hdmiusb-rpi4.yaml /etc/kvmd/main.yaml
 
 RUN touch /run/kvmd/ustreamer.sock /etc/kvmd/.docker_flag \
+    && adduser kvmd --gecos "" --disabled-password \
     && /usr/share/kvmd/kvmd-gencert --do-the-thing \
     && /usr/share/kvmd/kvmd-gencert --do-the-thing --vnc \
     && ln -sf /usr/share/tesseract-ocr/*/tessdata /usr/share/tessdata \
@@ -91,4 +92,4 @@ RUN touch /run/kvmd/ustreamer.sock /etc/kvmd/.docker_flag \
 #RUN supervisord -c /etc/kvmd/supervisord.conf
 
 EXPOSE 4430
-CMD ["/bin/bash", "/etc/kvmd/init.sh", "&&", "supervisord", "-c", "/etc/kvmd/supervisord.conf"]
\ No newline at end of file
+CMD ["/etc/kvmd/init.sh"]
\ No newline at end of file
diff --git a/build/v2-hdmiusb-rpi4.override.yaml b/build/v2-hdmiusb-rpi4.override.yaml
index dc80928b..fe4a31a9 100644
--- a/build/v2-hdmiusb-rpi4.override.yaml
+++ b/build/v2-hdmiusb-rpi4.override.yaml
@@ -7,7 +7,7 @@ kvmd:
 
     hid:
         type: ch9329
-        device: /dev/ttyUSB0
+        device: /dev/kvmd-hid
 
     msd:
         type: disabled
@@ -15,7 +15,7 @@ kvmd:
     streamer:
         cmd:
             - "/usr/local/bin/ustreamer"
-            - "--device=/dev/video0"
+            - "--device=/dev/kvmd-video"
             - "--persistent"
             - "--format=mjpeg"
             - "--resolution={resolution}"
diff --git a/configs/kvmd/init.sh b/configs/kvmd/init.sh
old mode 100644
new mode 100755
index 99b93162..df6c91bb
--- a/configs/kvmd/init.sh
+++ b/configs/kvmd/init.sh
@@ -25,7 +25,10 @@ redirect_stderr=true
 EOF
     fi
     if [ -d /sys/kernel/config/usb_gadget/kvmd ]; then
-        echo "Usb_gadget kvmd exists,delete it."
-        python -m kvmd.apps.otg stop
+        echo "Usb_gadget kvmd exists,please reboot your host system."
+    elif [ ! -d /sys/kernel/config/usb_gadget ]; then
+        mount -t configfs none /sys/kernel/config
     fi
-fi
\ No newline at end of file
+    
+fi
+supervisord -c /etc/kvmd/supervisord.conf
\ No newline at end of file