feat: 新增香橙派 Zero One 设备构建支持

- 在 build_img.sh 中新增 orangepi-zero 构建目标支持

.github/workflows/build_img.yaml

@@ -16,7 +16,6 @@ on:
           - e900v22c
           - octopus-flanet
           - orangepi-zero
-          - oec-turbo
           - all
       create_release:
         description: 'Create GitHub Release'

build/Dockerfile

@@ -68,9 +68,8 @@ RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.lis
                 ;; \
         arm64) \
             apt-get install -y --no-install-recommends \
-                v4l-utils libv4l-0 libavutil57 \
-                libstdc++6 libavcodec59 libavformat59 \
-                libswscale6 libavfilter8 libavdevice59 \
+                v4l-utils libv4l-0 \
+                libstdc++6 \
                 libva2 libva-drm2 libva-x11-2 \
                 libvdpau1 ocl-icd-libopencl1 \
                 ;; \
@@ -87,18 +86,6 @@ RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.lis
        fi \
     && curl https://github.com/tsl0922/ttyd/releases/download/1.7.7/ttyd.$ARCH -L -o /usr/local/bin/ttyd \
     && chmod +x /usr/local/bin/ttyd \
-    && mkdir -p /tmp/gostc && cd /tmp/gostc \
-    && case ${TARGETARCH} in \
-        amd64) GOSTC_ARCH=amd64_v1 ;; \
-        arm) GOSTC_ARCH=arm_7 ;; \
-        arm64) GOSTC_ARCH=arm64_v8.0 ;; \
-        *) echo "Unsupported architecture for gostc: ${TARGETARCH}" && exit 1 ;; \
-    esac \
-    && curl -L https://github.com/mofeng-git/gostc-open/releases/download/v2.0.8-beta.2/gostc_linux_${GOSTC_ARCH}.tar.gz -o gostc.tar.gz \
-    && tar -xzf gostc.tar.gz \
-    && mv gostc /usr/bin/ \
-    && chmod +x /usr/bin/gostc \
-    && cd / && rm -rf /tmp/gostc \
     && adduser kvmd --gecos "" --disabled-password \
     && ln -sf /usr/share/tesseract-ocr/*/tessdata /usr/share/tessdata \
     && mkdir -p /etc/kvmd_backup/override.d \

build/Dockerfile-stage-0

@@ -54,13 +54,16 @@ RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.lis
         mesa-vdpau-drivers \
         v4l-utils \
         libv4l-dev \
-        ffmpeg \
-        libavcodec-dev \
-        libavformat-dev \
-        libavutil-dev \
-        libswscale-dev \
-        libavfilter-dev \
-        libavdevice-dev \
+	&& if [ ${TARGETARCH} != arm64 ]; then \
+		apt-get install -y --no-install-recommends \
+			ffmpeg \
+			libavcodec-dev \
+			libavformat-dev \
+			libavutil-dev \
+			libswscale-dev \
+			libavfilter-dev \
+			libavdevice-dev; \
+	fi \
 	&& if [ ${TARGETARCH} != arm ] && [ ${TARGETARCH} != arm64 ]; then \
 		apt-get install -y --no-install-recommends \
 			vainfo \
@@ -145,7 +148,7 @@ RUN git clone --depth=1 https://gitlab.freedesktop.org/libnice/libnice /tmp/libn
 
 # 编译 Rockchip MPP、RGA 和 FFmpeg（仅 arm64）
 RUN if [ ${TARGETARCH} = arm64 ]; then \
-    	git clone --depth=1 https://github.com/rockchip-linux/mpp.git /tmp/rkmpp \
+    	git clone -b jellyfin-mpp --depth=1 https://github.com/nyanmisaka/mpp.git /tmp/rkmpp \
     	&& mkdir -p /tmp/rkmpp/rkmpp_build && cd /tmp/rkmpp/rkmpp_build \
     	&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DBUILD_TEST=OFF .. \
     	&& make -j$(nproc) \
@@ -155,17 +158,21 @@ RUN if [ ${TARGETARCH} = arm64 ]; then \
     	&& meson setup rkrga rkrga_build --prefix=/usr --libdir=lib --buildtype=release -Dcpp_args=-fpermissive -Dlibdrm=false -Dlibrga_demo=false \
     	&& meson configure rkrga_build > /dev/null \
     	&& ninja -C rkrga_build install \
-        && rm -rf /tmp/rkmpp /tmp/rkrga; \
+    	&& git clone --depth=1 https://github.com/nyanmisaka/ffmpeg-rockchip.git /tmp/ffmpeg-rockchip \
+    	&& cd /tmp/ffmpeg-rockchip \
+    	&& ./configure --prefix=/usr --enable-gpl --enable-version3 --enable-libdrm --enable-rkmpp --enable-rkrga \
+          --enable-libv4l2 --enable-libx264 --enable-shared --disable-programs \
+          --disable-doc --disable-htmlpages --disable-manpages --disable-network  --disable-protocols \
+          --disable-decoders --disable-debug --disable-alsa \
+    	&& make -j$(nproc) \
+    	&& make install \
+    	&& rm -rf /tmp/rkmpp /tmp/rkrga /tmp/ffmpeg-rockchip; \
     fi
 
 # 编译 ustreamer
 RUN sed --in-place --expression 's|^#include "refcount.h"$|#include "../refcount.h"|g' /usr/include/janus/plugins/plugin.h \
     && git clone --depth=1 https://github.com/mofeng-git/ustreamer /tmp/ustreamer \
-    && if [ ${TARGETARCH} = arm64 ]; then \
-        make -j$(nproc) WITH_PYTHON=1 WITH_JANUS=1 WITH_FFMPEG=1 WITH_MPP=1 WITH_DRM=1 -C /tmp/ustreamer; \
-    else \
-        make -j$(nproc) WITH_PYTHON=1 WITH_JANUS=1 WITH_FFMPEG=1 WITH_DRM=1 -C /tmp/ustreamer; \
-    fi \
+    && make -j$(nproc) WITH_PYTHON=1 WITH_JANUS=1 WITH_FFMPEG=1 -C /tmp/ustreamer \
     && /tmp/ustreamer/ustreamer -v \
     && /tmp/ustreamer/ustreamer-dump -v \
     && cp /tmp/ustreamer/python/dist/*.whl /tmp/wheel/
@@ -179,8 +186,9 @@ RUN mkdir /tmp/lib \
     && find /usr/lib -name "libsrtp2.so.*" -exec cp {} /tmp/lib/ \; \
     && find /usr/lib -name "libwebsockets.so.*" -exec cp {} /tmp/lib/ \; \
     && if [ ${TARGETARCH} = arm64 ]; then \
-        find /usr/lib -name "libsw*.so.*" -exec cp {} /tmp/lib/ \; \
+        find /usr/lib -name "libav*.so.*" -exec cp {} /tmp/lib/ \; \
+        && find /usr/lib -name "libsw*.so.*" -exec cp {} /tmp/lib/ \; \
         && find /usr/lib -name "libpostproc.so.*" -exec cp {} /tmp/lib/ \; \
         && find /usr/lib -name "librockchip*" -exec cp {} /tmp/lib/ \; \
         && find /usr/lib -name "librga.so.*" -exec cp {} /tmp/lib/ \; ; \
-    fi
+    fi

build/build_img.sh

@@ -101,7 +101,7 @@ build_target() {
             onecloud_pro_rootfs
             local arch="aarch64"
             local device_type="gpio-onecloud-pro video1"
-            local network_type="systemd-networkd"
+            local network_type=""
             NEED_PREPARE_DNS=true
             ;;
         orangepi-zero)
@@ -111,13 +111,6 @@ build_target() {
             local network_type=""
             NEED_PREPARE_DNS=true
             ;;
-        oec-turbo)
-            oec_turbo_rootfs
-            local arch="aarch64"
-            local device_type="vpu"
-            local network_type=""
-            NEED_PREPARE_DNS=true
-            ;;
         *)
             echo "错误：未知或不支持的目标 '$target'" >&2
             exit 1
@@ -157,9 +150,6 @@ build_target() {
         orangepi-zero)
             pack_img "Orangepi-Zero"
             ;;
-        oec-turbo)
-            pack_img "OEC-Turbo"
-            ;;
         *)
             echo "错误：未知的打包类型 for '$target'" >&2
             ;;
@@ -178,7 +168,7 @@ build_target() {
 # 检查是否提供了目标参数
 if [ -z "$1" ]; then
     echo "用法: $0 <target|all>"
-    echo "可用目标: onecloud, cumebox2, chainedbox, vm, e900v22c, octopus-flanet, onecloud-pro, orangepi-zero, oec-turbo"
+    echo "可用目标: onecloud, cumebox2, chainedbox, vm, e900v22c, octopus-flanet, onecloud-pro, orangepi-zero"
     exit 1
 fi
 
@@ -199,7 +189,6 @@ if [ "$1" = "all" ]; then
     build_target "octopus-flanet"
     build_target "onecloud-pro"
     build_target "orangepi-zero"
-    build_target "oec-turbo"
     echo "信息：所有目标构建完成。"
 else
     build_target "$1"

build/functions/devices.sh

@@ -333,7 +333,7 @@ config_octopus_flanet_files() {
     sudo cp "$config_file" "$ROOTFS/etc/model_database.conf" || echo "警告：复制 model_database.conf 失败"
 }
 
-config_orangepi_zero_files() {
+config_orangepizero_files() {
     echo "信息：配置 Orange Pi Zero 特定文件..."
 
     # 清空 modules.conf 文件，避免加载不必要的模块
@@ -341,97 +341,3 @@ config_orangepi_zero_files() {
 
     echo "信息：Orange Pi Zero 特定配置完成。"
 }
-
-config_onecloud_pro_files() {
-    echo "信息：配置 Onecloud Pro 特定文件..."
-    echo "信息：Onecloud Pro 特定配置完成。"
-}
-
-config_onecloud_files() {
-    echo "信息：配置 Onecloud 特定文件..."
-    
-    # 在 ustreamer 命令中添加 DRM 设备配置
-    echo "信息：为 Onecloud 添加 DRM 设备支持..."
-    run_in_chroot "sed -i \"/--device=\\/dev\\/video0/a\\            - \\\"--drm-device=/dev/dri/card1\\\"\" /etc/kvmd/override.yaml"
-    
-    echo "信息：Onecloud 特定配置完成。"
-}
-
-oec_turbo_rootfs() {
-    local source_image="$SRCPATH/image/oec-turbo/Flash_Armbian_25.05.0_rockchip_efused-wxy-oec_bookworm_6.1.99_server_2025.03.20.img"
-    local target_image="$TMPDIR/rootfs.img"
-    local rootfs_offset=$((1409024 * 512))  # 根据分区7的起始扇区计算
-
-    echo "信息：准备 OEC-Turbo Rootfs (Debian 12)..."
-    ensure_dir "$TMPDIR"
-
-    echo "信息：下载或使用本地 OEC-Turbo 原始镜像..."
-    download_file_if_missing "$source_image" || { echo "错误：下载 OEC-Turbo 原始镜像失败" >&2; exit 1; }
-
-    cp "$source_image" "$target_image" || { echo "错误：复制 OEC-Turbo 原始镜像失败" >&2; exit 1; }
-
-    find_loop_device
-    # 设置 loop 设备指向 rootfs 分区 (分区7)
-    sudo losetup "$LOOPDEV" "$target_image" -o "$rootfs_offset" || { echo "错误：设置 loop 设备失败" >&2; exit 1; }
-
-    echo "信息：OEC-Turbo Rootfs 准备完成，loop 设备 $LOOPDEV 已就绪。"
-}
-
-config_oec_turbo_files() {
-    echo "信息：配置 OEC-Turbo 特定文件..."
-
-    # 替换 override.yaml 中的硬件编码配置，启用 RK MPP 硬件编码
-    echo "信息：配置 VPU 硬件编码支持..."
-    run_in_chroot "sed -i 's/--h264-hwenc=disabled/--h264-hwenc=rkmpp/g' /etc/kvmd/override.yaml"
-
-    # 配置 rc.local 自启脚本，添加设备权限设置
-    echo "信息：配置 rc.local 自启脚本..."
-    run_in_chroot "cat > /etc/rc.local << 'EOF'
-#!/bin/bash
-chmod 777 /dev/mpp_service /dev/rga
-exit 0
-EOF"
-    run_in_chroot "chmod +x /etc/rc.local"
-
-    # 确保 rc-local.service 被启用，以便 kvmd 服务可以依赖它
-    echo "信息：启用 rc-local.service 服务..."
-    run_in_chroot "systemctl enable rc-local.service"
-
-    # 替换 DTB 文件
-    replace_oec_turbo_dtb
-
-    echo "信息：OEC-Turbo 特定配置完成。"
-}
-
-replace_oec_turbo_dtb() {
-    local dtb_source="$SRCPATH/image/oec-turbo/rk3566-onething-oec-box.dtb"
-    local target_image="$TMPDIR/rootfs.img"
-    local boot_offset=$((360448 * 512))  # boot 分区6的偏移
-    local boot_mount="$TMPDIR/oec_boot_mount"
-    local dtb_target_path="dtb/rockchip/rk3566-onething-oec-box.dtb"
-    local boot_loopdev=""
-
-    echo "信息：替换 OEC-Turbo DTB 文件..."
-
-    if [ ! -f "$dtb_source" ]; then
-        echo "信息：尝试下载 DTB 文件..."
-        download_file_if_missing "$dtb_source"
-    fi
-
-    echo "信息：为 boot 分区查找独立的 loop 设备..."
-    # 查找一个新的loop设备用于boot分区
-    boot_loopdev=$(losetup -f)
-    ensure_dir "$boot_mount"
-
-    losetup -o "$boot_offset" "$boot_loopdev" "$target_image"
-    mount "$boot_loopdev" "$boot_mount"
-
-    # 确保目标目录存在并复制 DTB 文件
-    mkdir -p "$boot_mount/$(dirname "$dtb_target_path")"
-    cp "$dtb_source" "$boot_mount/$dtb_target_path"
-    echo "信息：DTB 文件替换成功: $dtb_target_path"
-
-    umount "$boot_mount"
-    losetup -d "$boot_loopdev"
-    rmdir "$boot_mount"
-}

build/functions/install.sh

@@ -78,7 +78,7 @@ config_base_files() {
     sudo chmod +x "$ROOTFS/usr/bin/kvmd-gencert" "$ROOTFS/usr/bin/kvmd-bootconfig" "$ROOTFS/usr/bin/kvmd-certbot" "$ROOTFS/usr/bin/kvmd-udev-hdmiusb-check" "$ROOTFS/usr/bin/kvmd-udev-restart-pass" "$ROOTFS/usr/bin/kvmd-firstrun.sh"
     
     # 尝试下载或使用本地 rc.local 文件
-    download_rc_local "$platform_id" || echo "信息：rc.local 文件不存在，跳过"
+    download_rc_local "$platform_id"
     if [ -f "$SRCPATH/image/$platform_id/rc.local" ]; then
         echo "信息：复制设备特定的 rc.local 文件..."
         sudo cp "$SRCPATH/image/$platform_id/rc.local" "$ROOTFS/etc/"
@@ -110,7 +110,7 @@ install_base_packages() {
         iptables network-manager curl kmod libmicrohttpd12 libjansson4 libssl3 \\
         libsofia-sip-ua0 libglib2.0-0 libopus0 libogg0 libcurl4 libconfig9 \\
         python3-pip net-tools libavcodec59 libavformat59 libavutil57 libswscale6 \\
-        libavfilter8 libavdevice59 v4l-utils libv4l-0 nano unzip dnsmasq python3-systemd && \\
+        libavfilter8 libavdevice59 v4l-utils libv4l-0 nano unzip && \\
     apt clean && \\
     rm -rf /var/lib/apt/lists/*
     "
@@ -121,9 +121,9 @@ configure_network() {
     if [ "$network_type" = "systemd-networkd" ]; then
         echo "信息：在 chroot 环境中配置 systemd-networkd..."
         
-        # onecloud 与 onecloud-pro 均启用基于 SN 的 MAC 地址生成
-        if [ "$TARGET_DEVICE_NAME" = "onecloud" ] || [ "$TARGET_DEVICE_NAME" = "onecloud-pro" ]; then
-            echo "信息：为 ${TARGET_DEVICE_NAME} 平台配置基于 SN 的 MAC 地址生成机制..."
+        # 检查是否为onecloud平台，如果是则使用随机MAC地址生成机制
+        if [ "$TARGET_DEVICE_NAME" = "onecloud" ]; then
+            echo "信息：为onecloud平台配置随机MAC地址生成机制..."
             
             # 复制MAC地址生成脚本
             sudo cp "$SCRIPT_DIR/scripts/generate-random-mac.sh" "$ROOTFS/usr/local/bin/"
@@ -140,7 +140,7 @@ configure_network() {
             systemctl enable systemd-networkd systemd-resolved && \\
             systemctl enable kvmd-generate-mac.service
             "
-            echo "信息：${TARGET_DEVICE_NAME} 基于 SN 的 MAC 地址生成机制配置完成"
+            echo "信息：onecloud随机MAC地址生成机制配置完成"
         fi
     else
         echo "信息：使用默认的网络管理器 (NetworkManager)..."
@@ -181,7 +181,6 @@ configure_system() {
     cat /One-KVM/configs/os/sudoers/v2-hdmiusb >> /etc/sudoers && \\
     cat /One-KVM/configs/os/udev/v2-hdmiusb-rpi4.rules > /etc/udev/rules.d/99-kvmd.rules && \\
     echo 'libcomposite' >> /etc/modules && \\
-    echo 'net.ipv4.ip_forward = 1' > /etc/sysctl.d/99-kvmd-extra.conf && \\
     mv /usr/local/bin/kvmd* /usr/bin/ || echo '信息：/usr/local/bin/kvmd* 未找到或移动失败，可能已在/usr/bin' && \\
     cp -r /One-KVM/configs/os/services/* /etc/systemd/system/ && \\
     cp /One-KVM/configs/os/tmpfiles.conf /usr/lib/tmpfiles.d/ && \\
@@ -194,8 +193,8 @@ configure_system() {
     sed -i 's/8080/80/g' /etc/kvmd/override.yaml && \\
     sed -i 's/4430/443/g' /etc/kvmd/override.yaml && \\
     chown kvmd -R /var/lib/kvmd/msd/ && \\
-    systemctl enable dnsmasq kvmd kvmd-otg kvmd-nginx kvmd-vnc kvmd-ipmi kvmd-webterm kvmd-janus kvmd-media kvmd-gostc && \\
-    systemctl disable nginx systemd-resolved && \\
+    systemctl enable kvmd kvmd-otg kvmd-nginx kvmd-vnc kvmd-ipmi kvmd-webterm kvmd-janus kvmd-media && \\
+    systemctl disable nginx && \\
     rm -rf /One-KVM
     "
 }
@@ -221,54 +220,6 @@ install_webterm() {
     "
 }
 
-install_gostc() {
-    local arch="$1" # armhf, aarch64, x86_64
-    local gostc_arch="$arch"
-    local gostc_version="v2.0.8-beta.2"
-    
-    # 根据架构映射下载文件名
-    case "$arch" in
-        armhf) gostc_arch="arm_7" ;;
-        aarch64) gostc_arch="arm64_v8.0" ;;
-        x86_64|amd64) gostc_arch="amd64_v1" ;;
-        *) echo "错误：不支持的架构 $arch"; exit 1 ;;
-    esac
-    
-    echo "信息：在 chroot 环境中下载并安装 gostc ($gostc_arch)..."
-    run_in_chroot "
-    mkdir -p /tmp/gostc && cd /tmp/gostc && \\
-    curl -L https://github.com/mofeng-git/gostc-open/releases/download/${gostc_version}/gostc_linux_${gostc_arch}.tar.gz -o gostc.tar.gz && \\
-    tar -xzf gostc.tar.gz && \\
-    mv gostc /usr/bin/ && \\
-    chmod +x /usr/bin/gostc && \\
-    cd / && rm -rf /tmp/gostc
-    "
-    
-    echo "信息：创建 gostc systemd 服务文件..."
-    run_in_chroot "
-    cat > /etc/systemd/system/kvmd-gostc.service << 'EOF'
-[Unit]
-Description=基于FRP开发的内网穿透 客户端/节点
-ConditionFileIsExecutable=/usr/bin/gostc
-After=network.target
-
-[Service]
-StartLimitInterval=5
-StartLimitBurst=10
-ExecStart=/usr/bin/gostc \"-web-addr\" \"0.0.0.0:18080\"
-WorkingDirectory=/usr/bin
-Restart=always
-RestartSec=10
-EnvironmentFile=-/etc/sysconfig/gostc
-
-[Install]
-WantedBy=multi-user.target
-EOF
-    "
-    
-    echo "信息：gostc 安装和配置完成"
-}
-
 apply_kvmd_tweaks() {
     local arch="$1" # armhf, aarch64, x86_64
     local device_type="$2" # "gpio" or "video1" or other
@@ -353,11 +304,9 @@ install_and_configure_kvmd() {
     config_base_files "$TARGET_DEVICE_NAME" # 使用全局变量传递设备名
 
     # 特定设备的额外文件配置 (如果存在)
-    # 将设备名中的连字符转换为下划线以匹配函数名
-    local device_func_name="${TARGET_DEVICE_NAME//-/_}"
-    if declare -f "config_${device_func_name}_files" > /dev/null; then
-        echo "信息：执行特定设备的文件配置函数 config_${device_func_name}_files ..."
-        "config_${device_func_name}_files"
+    if declare -f "config_${TARGET_DEVICE_NAME}_files" > /dev/null; then
+        echo "信息：执行特定设备的文件配置函数 config_${TARGET_DEVICE_NAME}_files ..."
+        "config_${TARGET_DEVICE_NAME}_files"
     fi
 
     # 某些镜像可能需要准备DNS和换源
@@ -372,7 +321,6 @@ install_and_configure_kvmd() {
     configure_network "$network_type"
     install_python_deps
     configure_kvmd_core
-    install_gostc "$arch" # 安装 gostc
     configure_system
     install_webterm "$arch" # 传递原始架构名给ttyd下载
     apply_kvmd_tweaks "$arch" "$device_type"

build/platform/oec-turbo

@@ -1,3 +0,0 @@
-PIKVM_MODEL=v2_model
-PIKVM_VIDEO=usb_video
-PIKVM_BOARD=oec-turbo

build/scripts/generate-random-mac.sh

@@ -1,45 +1,12 @@
 #!/bin/bash
 
-# 为玩客云/玩客云Pro 平台生成 MAC 地址的一次性脚本
-# 此脚本在首次开机时执行，为 eth0 网卡生成并应用基于 SN 的 MAC 地址，失败时回退到随机 MAC
+# 为onecloud平台生成随机MAC地址的一次性脚本
+# 此脚本在首次开机时执行，为eth0网卡生成并应用随机MAC地址
 
 set -e
 
 NETWORK_CONFIG="/etc/systemd/network/99-eth0.network"
 LOCK_FILE="/var/lib/kvmd/.mac-generated"
-PLATFORM_FILE="/usr/share/kvmd/platform"
-EFUSE_SYSFS_PATH=""
-SN_PREFIX=""
-SN_EXPECTED_LENGTH=13
-
-# 按平台设置 EFUSE 与 SN 参数；未知平台时按 efuse 路径探测
-detect_platform_params() {
-    local platform=""
-    if [ -f "$PLATFORM_FILE" ]; then
-        platform=$(tr -d '\n' < "$PLATFORM_FILE")
-    fi
-
-    case "$platform" in
-        onecloud)
-            EFUSE_SYSFS_PATH="/sys/bus/nvmem/devices/meson8b-efuse0/nvmem"
-            SN_PREFIX="OCP"
-            ;;
-        onecloud-pro)
-            EFUSE_SYSFS_PATH="/sys/devices/platform/efuse/efuse0/nvmem"
-            SN_PREFIX="ODC"
-            ;;
-    esac
-
-    if [ -z "$EFUSE_SYSFS_PATH" ] || [ -z "$SN_PREFIX" ]; then
-        if [ -e "/sys/devices/platform/efuse/efuse0/nvmem" ]; then
-            EFUSE_SYSFS_PATH="/sys/devices/platform/efuse/efuse0/nvmem"
-            SN_PREFIX="ODC"
-        elif [ -e "/sys/bus/nvmem/devices/meson8b-efuse0/nvmem" ]; then
-            EFUSE_SYSFS_PATH="/sys/bus/nvmem/devices/meson8b-efuse0/nvmem"
-            SN_PREFIX="OCP"
-        fi
-    fi
-}
 
 # 检查是否已经执行过
 if [ -f "$LOCK_FILE" ]; then
@@ -47,29 +14,10 @@ if [ -f "$LOCK_FILE" ]; then
     exit 0
 fi
 
-# 生成MAC地址函数
+# 生成随机MAC地址 (使用本地管理的MAC地址前缀)
 generate_random_mac() {
-    detect_platform_params
-    # 尝试根据 SN 生成唯一 MAC 地址
-    if [ -f "$EFUSE_SYSFS_PATH" ]; then
-        sn_offset=$(grep --binary-files=text -boP "$SN_PREFIX" "$EFUSE_SYSFS_PATH" | head -n1 | cut -d: -f1)
-        if [ -n "$sn_offset" ]; then
-            sn=$(cat "$EFUSE_SYSFS_PATH" | dd bs=1 skip="$sn_offset" count="$SN_EXPECTED_LENGTH" 2>/dev/null)
-            if [ ${#sn} -eq $SN_EXPECTED_LENGTH ]; then
-                echo "S/N: $sn" >&2  # 输出到 stderr，避免干扰返回值
-                # 使用 SN 的 SHA-256 哈希生成后 5 字节（避免多余管道）
-                sn_hash=$(printf %s "$sn" | sha256sum | cut -d' ' -f1)
-                # 直接用 Bash 子串获取哈希末 10 个字符并插入分隔符
-                mac_hex=${sn_hash: -10}
-                mac_suffix=$(printf "%s:%s:%s:%s:%s" "${mac_hex:0:2}" "${mac_hex:2:2}" "${mac_hex:4:2}" "${mac_hex:6:2}" "${mac_hex:8:2}")
-                printf "02:%s\n" "$mac_suffix"
-                return 0
-            fi
-        fi
-    fi
-
-    # 若 SN 获取失败，回退到随机逻辑
-    echo "警告: 无法获取 SN，回退到随机 MAC 生成" >&2
+    # 使用本地管理的MAC地址前缀 (第二位设为2、6、A、E中的一个)
+    # 这样可以避免与真实硬件MAC地址冲突
     printf "02:%02x:%02x:%02x:%02x:%02x\n" \
         $((RANDOM % 256)) \
         $((RANDOM % 256)) \
@@ -78,18 +26,12 @@ generate_random_mac() {
         $((RANDOM % 256))
 }
 
-echo "正在生成基于 SN 的 MAC 地址..."
+echo "正在为onecloud生成随机MAC地址..."
 
 # 生成新的MAC地址
 NEW_MAC=$(generate_random_mac)
 echo "生成的MAC地址: $NEW_MAC"
 
-# 验证 MAC 地址格式
-if ! [[ $NEW_MAC =~ ^([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$ ]]; then
-    echo "错误: 生成的 MAC 地址格式无效: $NEW_MAC"
-    exit 1
-fi
-
 # 备份原配置文件
 if [ -f "$NETWORK_CONFIG" ]; then
     cp "$NETWORK_CONFIG" "${NETWORK_CONFIG}.backup"
@@ -116,7 +58,7 @@ echo "MAC地址生成时间: $(date)" > "$LOCK_FILE"
 # 禁用此服务，确保只运行一次
 systemctl disable kvmd-generate-mac.service
 
-echo "MAC地址生成完成: $NEW_MAC"
+echo "随机MAC地址生成完成: $NEW_MAC"
 echo "服务已自动禁用，下次开机不会再执行"
 
-exit 0
+exit 0 

configs/janus/janus.plugin.ustreamer.jcfg

@@ -2,6 +2,6 @@ video: {
 	sink = "kvmd::ustreamer::h264"
 }
 acap: {
-     device = "hw:0,0"
+     device = "hw:0"
      tc358743 = "/dev/video0"
 }

configs/kvmd/supervisord.conf

@@ -53,17 +53,6 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes = 0
 redirect_stderr=true
 
-[program:kvmd-gostc]
-command=/usr/bin/gostc -web-addr 0.0.0.0:18080
-autostart=true
-autorestart=true
-startsecs=5
-priority=300
-stopasgroup=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes = 0
-redirect_stderr=true
-
 [program:clean_when_exit]
 command=/etc/kvmd/clean_when_exit.sh
 autostart=true

configs/os/services/kvmd.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=One-KVM - The main daemon
-After=network.target network-online.target nss-lookup.target rc-local.service
+After=network.target network-online.target nss-lookup.target
 
 [Service]
 User=kvmd

extras/gostc/manifest.yaml

@@ -1,6 +0,0 @@
-name: GOSTC
-description: GOSTC Server
-icon: share/svg/gostc.svg
-path: extras/gostc
-daemon: kvmd-gostc
-place: 11

extras/gostc/nginx.ctx-server.conf

@@ -1,7 +0,0 @@
-location /extras/gostc {
-	proxy_pass http://127.0.0.1:18080;
-	include /etc/kvmd/nginx/loc-proxy.conf;
-	include /etc/kvmd/nginx/loc-websocket.conf;
-	include /etc/kvmd/nginx/loc-login.conf;
-	include /etc/kvmd/nginx/loc-nocache.conf;
-}