GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 01:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

为整合包补全 python3-hid 依赖

Browse Source 
修复 amd64 架构 docker 错误启用 MSD功能
This commit is contained in:
mofeng-git 2024-10-11 11:49:07 +00:00
parent 87c887a62b
commit 6707cb9932
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/build_img.sh
View File

@ -79,7 +79,7 @@ instal_one-kvm() {
apt update \ apt update \
&& apt install -y python3-aiofiles python3-aiohttp python3-appdirs python3-asn1crypto python3-async-timeout \ && apt install -y python3-aiofiles python3-aiohttp python3-appdirs python3-asn1crypto python3-async-timeout \
python3-bottle python3-cffi python3-chardet python3-click python3-colorama python3-cryptography python3-dateutil \ python3-bottle python3-cffi python3-chardet python3-click python3-colorama python3-cryptography python3-dateutil \
python3-dbus python3-dev python3-hidapi python3-idna python3-libgpiod python3-mako python3-marshmallow python3-more-itertools \ python3-dbus python3-dev python3-hidapi python3-hid python3-idna python3-libgpiod python3-mako python3-marshmallow python3-more-itertools \
python3-multidict python3-netifaces python3-packaging python3-passlib python3-pillow python3-ply python3-psutil \ python3-multidict python3-netifaces python3-packaging python3-passlib python3-pillow python3-ply python3-psutil \
python3-pycparser python3-pyelftools python3-pyghmi python3-pygments python3-pyparsing python3-requests \ python3-pycparser python3-pyelftools python3-pyghmi python3-pygments python3-pyparsing python3-requests \
python3-semantic-version python3-setproctitle python3-setuptools python3-six python3-spidev python3-systemd \ python3-semantic-version python3-setproctitle python3-setuptools python3-six python3-spidev python3-systemd \
@ -223,10 +223,3 @@ case $1 in
echo "Do no thing." echo "Do no thing."
;; ;;
esac esac
#开发计划
#深度适配私家云二代
#修改dtb 修复玩客云/sys/class/usb_role不存在
#x86 禁用MSD ：通过docker环境变量判断替换配置文件
#添加msd文件夹配置选项

12
build/init.sh
View File

@ -100,6 +100,11 @@ EOF
echo -e "${GREEN}One-KVM OTG is enabled.${NC}" echo -e "${GREEN}One-KVM OTG is enabled.${NC}"
sed -i "s/ch9329/otg/g" /etc/kvmd/override.yaml sed -i "s/ch9329/otg/g" /etc/kvmd/override.yaml
sed -i "s/device: \/dev\/ttyUSB0//g" /etc/kvmd/override.yaml sed -i "s/device: \/dev\/ttyUSB0//g" /etc/kvmd/override.yaml
if [ "$NOMSD" == 1 ]; then
echo -e "${GREEN}One-KVM MSD is disabled.${NC}"
else
sed -i "s/#type: otg/type: otg/g" /etc/kvmd/override.yaml
fi
fi fi
#if [ ! -z "$SHUTDOWNPIN" ! -z "$REBOOTPIN" ]; then #if [ ! -z "$SHUTDOWNPIN" ! -z "$REBOOTPIN" ]; then
@ -120,15 +125,10 @@ EOF
echo -e "${YELLOW} USERNAME and PASSWORD environment variables is not set, using defalut(admin/admin).${NC}" echo -e "${YELLOW} USERNAME and PASSWORD environment variables is not set, using defalut(admin/admin).${NC}"
fi fi
if [ "$NOMSD" == 1 ]; then
echo -e "${GREEN}One-KVM MSD is disabled.${NC}"
else
sed -i "s/#type: otg/type: otg/g" /etc/kvmd/override.yaml
fi
touch /etc/kvmd/.init_flag touch /etc/kvmd/.init_flag
fi fi
#Trying usb_gadget #Trying usb_gadget
if [ "$OTG" == "1" ]; then if [ "$OTG" == "1" ]; then
echo "Trying OTG Port..." echo "Trying OTG Port..."