fix

build/Dockerfile

@@ -5,7 +5,7 @@ ARG TARGETARCH
 
 RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list.d/debian.sources \
     && apt-get update \
-    && apt-get install -y --no-install-recommends build-essential libssl-dev libffi-dev python3-dev libevent-dev libjpeg-dev libbsd-dev git pkg-config wget curl
+    && apt-get install -y --no-install-recommends build-essential libssl-dev libffi-dev python3-dev libevent-dev libjpeg-dev libbsd-dev libudev-dev git pkg-config wget curl
 
 COPY build/cargo_config /tmp/config
 
@@ -63,6 +63,7 @@ RUN mkdir -p \
     /etc/kvmd/nginx \
     /etc/kvmd/vnc \
     /etc/kvmd/override.d\
+    /etc/kvmd/hw_info/ \
     /var/lib/kvmd/msd \
     /var/lib/kvmd/pst/data \
     /opt/vc/bin \
@@ -72,11 +73,13 @@ RUN mkdir -p \
 COPY testenv/fakes/vcgencmd /usr/bin/
 COPY extras/ /usr/share/kvmd/extras/
 COPY web/ /usr/share/kvmd/web/
+COPY testenv/web.css /usr/share/kvmd/web/
 COPY testenv/platform/ scripts/kvmd-gencert /usr/share/kvmd/
 COPY contrib/keymaps /usr/share/kvmd/keymaps
 COPY kvmd/ /kvmd
 COPY configs/kvmd/*.yaml configs/kvmd/*passwd build/supervisord.conf /etc/kvmd/
 COPY configs/nginx/* /etc/kvmd/nginx/
+COPY configs/hw_info/* /etc/kvmd/hw_info/
 COPY build/v2-hdmiusb-rpi4.override.yaml /etc/kvmd/override.yaml
 COPY configs/kvmd/main/v2-hdmiusb-rpi4.yaml /etc/kvmd/main.yaml
 
@@ -87,7 +90,7 @@ RUN touch /run/kvmd/ustreamer.sock \
     && ln -sf /usr/share/tesseract-ocr/*/tessdata /usr/share/tessdata \
     && python -m kvmd.apps.ngxmkconf /etc/kvmd/nginx/nginx.conf.mako /etc/kvmd/nginx/nginx.conf
 
-RUN supervisord -c /etc/kvmd/supervisord.conf
+#RUN supervisord -c /etc/kvmd/supervisord.conf
 
 EXPOSE 4430
 CMD ["supervisord", "-c", "/etc/kvmd/supervisord.conf"]

kvmd/apps/kvmd/info/hw.py

@@ -112,7 +112,7 @@ class HwInfoSubmanager(BaseInfoSubmanager):
         if name not in self.__dt_cache:
             path = os.path.join(f"{env.PROCFS_PREFIX}/proc/device-tree", name)
             if not os.path.exists(path):
-                path = os.path.join(f"{env.PROCFS_PREFIX}/usr/share/kvmd/extras/hw_info/", name)
+                path = os.path.join(f"{env.PROCFS_PREFIX}/etc/kvmd/hw_info/", name)
             try:
                 self.__dt_cache[name] = (await aiotools.read_file(path)).strip(" \t\r\n\0")
             except Exception as err:
@@ -143,7 +143,7 @@ class HwInfoSubmanager(BaseInfoSubmanager):
         try:
             return int((await aiotools.read_file(temp_path)).strip()) / 1000
         except Exception as err:
-            get_logger(0).warn("Can't read CPU temp from %s: %s", temp_path, err)
+            #get_logger(0).warn("Can't read CPU temp from %s: %s", temp_path, err)
             return None
 
     async def __get_cpu_percent(self) -> (float | None):

web/login/index.html

@@ -60,7 +60,7 @@
             <tr>
               <td i18n="password">Password:&nbsp;</td>
               <td>
-                <input type="password" id="passwd-input" autocapitalize="off">
+                <input type="current-password" id="passwd-input" autocapitalize="off">
               </td>
             </tr>
             <tr>

web/login/index.pug

@@ -26,8 +26,8 @@ block body
 						td(i18n="select_language") Select language: 
 						td
 							select(id="selectLanguage")
-								option(value='ch', selected="selected" class="chinese" i18n="chinese") Simplified Chinese
+								option(id='zh', selected="selected" i18n="chinese") Simplified Chinese
-								option(value='en' class="english" i18n="english") English
+								option(id='en' i18n="english") English
 					tr
 						td
 						td #[button(id="login-button" class="key" i18n="login") Login]

web/share/js/i18n/i18n.js

@@ -29,7 +29,7 @@ function getCookie(name)
 /**
  * 设置语言类型： 默认为中文
  */
-var i18nLanguage = "cn";
+var i18nLanguage = "zh";
 
 $(document).ready(function() {
      /* 首先获取用户选择过的语言 */ 
@@ -47,21 +47,16 @@ $(document).ready(function() {
             
         }
     });
-    /*切换为中文 - 按钮*/
+
-    $(".chinese").click(function() {
+    $("#selectLanguage").change(function() {
+        var selectOptionId = $(this).children("option:selected").attr("id");
+        console.log(selectOptionId);
         $("[i18n]").i18n({
-            defaultLang: "cn",
+            defaultLang: selectOptionId,
             filePath: "/share/i18n/"
         });
         setCookie('userLanguage', "cn")
     });
-    /*切换为英文 - 按钮*/
+
-    $(".english").click(function() {
-        $("[i18n]").i18n({
-            defaultLang: "en",
-            filePath: "/share/i18n/"
-        });
-        setCookie('userLanguage', "en")
-    });
 
 });