diff --git a/build/build_img.sh b/build/build_img.sh index 456c1302..84af7371 100644 --- a/build/build_img.sh +++ b/build/build_img.sh @@ -212,6 +212,7 @@ instal_one-kvm() { && mv /usr/local/bin/kvmd* /usr/bin \ && cp /One-KVM/configs/os/services/* /etc/systemd/system/ \ && cp /One-KVM/configs/os/tmpfiles.conf /usr/lib/tmpfiles.d/ \ + && mv /etc/kvmd/supervisord.conf /etc/supervisord.conf \ && chmod +x /etc/update-motd.d/* \ && echo 'kvmd ALL=(ALL) NOPASSWD: /etc/kvmd/custom_atx/gpio.sh' >> /etc/sudoers \ && echo 'kvmd ALL=(ALL) NOPASSWD: /etc/kvmd/custom_atx/usbrelay_hid.sh' >> /etc/sudoers \ diff --git a/build/init.sh b/build/init.sh index 00331471..581c2d9e 100755 --- a/build/init.sh +++ b/build/init.sh @@ -109,7 +109,7 @@ if [ ! -f /etc/kvmd/.init_flag ]; then log_info "已禁用 WebTerm 功能" rm -r /usr/share/kvmd/extras/webterm else - cat >> /etc/kvmd/supervisord.conf << EOF + cat >> /etc/supervisord.conf << EOF [program:kvmd-webterm] command=/usr/local/bin/ttyd --interface=/run/kvmd/ttyd.sock --port=0 --writable /bin/bash -c '/etc/kvmd/armbain-motd; bash' @@ -125,14 +125,14 @@ EOF fi if [ "$NOWEBTERMWRITE" == "1" ]; then - sed -i "s/--writable//g" /etc/kvmd/supervisord.conf + sed -i "s/--writable//g" /etc/supervisord.conf fi if [ "$NOVNC" == "1" ]; then log_info "已禁用 VNC 功能" rm -r /usr/share/kvmd/extras/vnc else - cat >> /etc/kvmd/supervisord.conf << EOF + cat >> /etc/supervisord.conf << EOF [program:kvmd-vnc] command=python -m kvmd.apps.vnc --run @@ -151,7 +151,7 @@ EOF log_info "已禁用IPMI功能" rm -r /usr/share/kvmd/extras/ipmi else - cat >> /etc/kvmd/supervisord.conf << EOF + cat >> /etc/supervisord.conf << EOF [program:kvmd-ipmi] command=python -m kvmd.apps.ipmi --run @@ -241,4 +241,4 @@ if [ "$OTG" == "1" ]; then fi log_info "One-KVM 配置文件准备完成,正在启动服务..." -exec supervisord -c /etc/kvmd/supervisord.conf \ No newline at end of file +exec supervisord -c /etc/supervisord.conf \ No newline at end of file