From d7a9f0c96986e9370975afb206eb2d7990e1cf05 Mon Sep 17 00:00:00 2001 From: mofeng-git Date: Fri, 20 Sep 2024 16:51:52 +0800 Subject: [PATCH] update --- build/init.sh | 30 +++++++++--------------------- configs/kvmd/gpio.sh | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 21 deletions(-) create mode 100755 configs/kvmd/gpio.sh diff --git a/build/init.sh b/build/init.sh index 0cb01fc6..ab187f06 100755 --- a/build/init.sh +++ b/build/init.sh @@ -11,7 +11,8 @@ echo -e "${GREEN}One-KVM pre-starting...${NC}" #仅首次运行,用于初始化配置文件 if [ ! -f /etc/kvmd/.init_flag ]; then - cp -r /etc/kvmd_backup/* /etc/kvmd/ + mkdir -p /etc/kvmd/ + mv /etc/kvmd_backup/* /etc/kvmd/ touch /etc/kvmd/.docker_flag #生成 ssl 证书 和 vnc 证书 @@ -98,26 +99,18 @@ EOF echo -e "${GREEN}One-KVM OTG is enabled.${NC}" sed -i "s/ch9329/otg/g" /etc/kvmd/override.yaml sed -i "s/device: \/dev\/ttyUSB0//g" /etc/kvmd/override.yaml - cat >> /etc/kvmd/supervisord.conf << EOF - -[program:kvmd-otg] -command=python -m kvmd.apps.otg start -directory=/ -autostart=true -autorestart=unexpected -priority=9 -stopasgroup=true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes = 0 -redirect_stderr=true -EOF fi + #if [ ! -z "$SHUTDOWNPIN" ! -z "$REBOOTPIN" ]; then + #/dev/kvmd-video 设备优先级高于 /dev/video0,/dev/kvmd-hid 设备优先级高于 /dev/ttyUSB0 - if [ -f /dev/kvmd-video ]; then + if [ -f /dev/kvmd-video ] && [ -z "$VIDEONUM" ]; then echo -e "${GREEN}Found dev/kvmd-video, use it as kvmd video device.${NC}" sed -i "s/\/dev\/video0/\/dev\/kvmd-video/g" /etc/kvmd/override.yaml fi + if [ ! -z "$VIDEONUM" ]; then + sed -i "s/\/dev\/video0/\/dev\/video$VIDEONUM/g" /etc/kvmd/override.yaml + fi if [ -f /dev/kvmd-hid ]; then echo -e "${GREEN}Found /dev/kvmd-hid, use it as kvmd video device.${NC}" sed -i "s/\/dev\/ttyUSB0/\/dev\/kvmd-hid/g" /etc/kvmd/override.yaml @@ -140,12 +133,7 @@ fi #尝试挂载 usb_gadget if [ "$OTG" == "1" ]; then echo "Trying OTG Port..." - if [ -d /sys/kernel/config/usb_gadget/kvmd ]; then - echo -e "${RED}Usb_gadget kvmd exists, please reboot your host system. ${NC}" - exit -1 - elif [ ! -d /sys/kernel/config/usb_gadget ]; then - mount -t configfs none /sys/kernel/config - fi + python -m kvmd.apps.otg start fi echo -e "${GREEN}One-KVM starting...${NC}" diff --git a/configs/kvmd/gpio.sh b/configs/kvmd/gpio.sh new file mode 100755 index 00000000..0d2bef51 --- /dev/null +++ b/configs/kvmd/gpio.sh @@ -0,0 +1,17 @@ +#!/bin/bash +case $1 in + short) + gpioset -m time -s 1 SHUTDOWNPIN=0 + gpioset SHUTDOWNPIN=1 + ;; + long) + gpioset -m time -s 5 SHUTDOWNPIN=0 + gpioset SHUTDOWNPIN=1 + ;; + reset) + gpioset -m time -s 1 REBOOTPIN=0 + gpioset REBOOTPIN=1 + ;; + *) + echo "No thing." +esac \ No newline at end of file