添加 OTG 支持

build/Dockerfile

@@ -73,18 +73,16 @@ RUN mkdir -p \
 COPY testenv/fakes/vcgencmd /usr/bin/
 COPY extras/ /usr/share/kvmd/extras/
 COPY web/ /usr/share/kvmd/web/
-COPY testenv/web.css /etc/kvmd/
 COPY build/platform scripts/kvmd-gencert /usr/share/kvmd/
 COPY contrib/keymaps /usr/share/kvmd/keymaps
 COPY kvmd/ /kvmd
-COPY configs/kvmd/*.yaml configs/kvmd/*passwd build/supervisord.conf /etc/kvmd/
+COPY configs/kvmd/* /etc/kvmd/
 COPY configs/nginx/* /etc/kvmd/nginx/
 COPY configs/hw_info/* /etc/kvmd/hw_info/
 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 \
-    && touch /etc/kvmd/totp.secret \
     && /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 \
@@ -93,4 +91,4 @@ RUN touch /run/kvmd/ustreamer.sock /etc/kvmd/.docker_flag \
 #RUN supervisord -c /etc/kvmd/supervisord.conf
 
 EXPOSE 4430
-CMD ["supervisord", "-c", "/etc/kvmd/supervisord.conf"]
+CMD ["/bin/bash", "/etc/kvmd/init.sh", "&&", "supervisord", "-c", "/etc/kvmd/supervisord.conf"]

build/supervisord.conf

@@ -1,58 +0,0 @@
-[unix_http_server]
-file=/tmp/supervisor.sock
-
-[supervisord]
-nodaemon=true
-user=root
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[inet_http_server]
-port=127.0.0.1:9001 
-
-[supervisorctl]
-serverurl=unix:///tmp/supervisor.sock
-
-[program:kvmd]
-command=python -m kvmd.apps.kvmd --run
-directory=/
-autostart=true
-autorestart=true
-priority=10
-stopasgroup=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes = 0
-redirect_stderr=true
-
-[program:kvmd-vnc]
-command=python -m kvmd.apps.vnc --run
-directory=/
-autostart=true
-autorestart=true
-priority=11
-stopasgroup=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes = 0
-redirect_stderr=true
-
-[program:kvmd-ipmi]
-command=python -m kvmd.apps.ipmi --run
-directory=/
-autostart=true
-autorestart=true
-priority=12
-stopasgroup=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes = 0
-redirect_stderr=true
-
-[program:kvmd-nginx]
-command=nginx -c /etc/kvmd/nginx/nginx.conf -g 'daemon off;user root; error_log stderr;'
-autostart=true
-autorestart=true
-priority=100
-stopasgroup=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes = 0
-redirect_stderr=true

build/v2-hdmiusb-rpi4.override.yaml

@@ -7,7 +7,7 @@ kvmd:
 
     hid:
         type: ch9329
-        device: /dev/kvmd-hid
+        device: /dev/ttyUSB0
 
     msd:
         type: disabled
@@ -15,7 +15,7 @@ kvmd:
     streamer:
         cmd:
             - "/usr/local/bin/ustreamer"
-            - "--device=/dev/kvmd-video"
+            - "--device=/dev/video0"
             - "--persistent"
             - "--format=mjpeg"
             - "--resolution={resolution}"