From 8c8bf35d0b01f77da9873f423a27c387a3caa90a Mon Sep 17 00:00:00 2001
From: mofeng-git <mofeng654321@hotmail.com>
Date: Sun, 2 Feb 2025 07:08:40 +0000
Subject: [PATCH] fix

---
 build/init.sh             | 19 +++++++++++++++++--
 kvmd/apps/otg/__init__.py |  4 ++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/build/init.sh b/build/init.sh
index a7e46035..00331471 100755
--- a/build/init.sh
+++ b/build/init.sh
@@ -69,6 +69,21 @@ if [ ! -f /etc/kvmd/.init_flag ]; then
         exit 1
     fi
 
+    # 设置用户名和密码
+    if [ ! -z "$USERNAME" ] && [ ! -z "$PASSWORD" ]; then
+        if python -m kvmd.apps.htpasswd del admin \
+            && echo "$PASSWORD" | python -m kvmd.apps.htpasswd set -i "$USERNAME" \
+            && echo "$PASSWORD -> $USERNAME:$PASSWORD" > /etc/kvmd/vncpasswd \
+            && echo "$USERNAME:$PASSWORD -> $USERNAME:$PASSWORD" > /etc/kvmd/ipmipasswd; then
+            log_info "用户凭据设置成功"
+        else
+            log_error "用户凭据设置失败"
+            exit 1
+        fi
+    else
+        log_warn "未设置 USERNAME 和 PASSWORD 环境变量，使用默认值(admin/admin)"
+    fi
+
     # SSL开关配置
     if [ "$NOSSL" == 1 ]; then
         log_info "已禁用SSL"
@@ -220,8 +235,8 @@ if [ "$OTG" == "1" ]; then
         ln -s /dev/hidg2 /dev/kvmd-hid-mouse-alt
         log_info "OTG 设备配置完成"
     else
-        log_error "OTG 设备挂载失败"
-        exit 1
+        log_warn "OTG 设备挂载失败"
+        #exit 1
     fi
 fi
 
diff --git a/kvmd/apps/otg/__init__.py b/kvmd/apps/otg/__init__.py
index cf2bc00b..8951eb82 100644
--- a/kvmd/apps/otg/__init__.py
+++ b/kvmd/apps/otg/__init__.py
@@ -215,8 +215,8 @@ class _GadgetConfig:
         _write(join(func_path, "lun.0/ro"), int(not rw))
         _write(join(func_path, "lun.0/removable"), int(removable))
         _write(join(func_path, "lun.0/nofua"), int(not fua))
-        _write(join(func_path, "lun.0/inquiry_string_cdrom"), inquiry_string_cdrom)
-        _write(join(func_path, "lun.0/inquiry_string"), inquiry_string_flash)
+        #_write(join(func_path, "lun.0/inquiry_string_cdrom"), inquiry_string_cdrom)
+        #_write(join(func_path, "lun.0/inquiry_string"), inquiry_string_flash)
         if user != "root":
             _chown(join(func_path, "lun.0/cdrom"), user)
             _chown(join(func_path, "lun.0/ro"), user)