添加玩客云直刷镜像制作脚本

kvmd/apps/kvmd/info/hw.py

@@ -116,7 +116,7 @@ class HwInfoSubmanager(BaseInfoSubmanager):
             try:
                 self.__dt_cache[name] = (await aiotools.read_file(path)).strip(" \t\r\n\0")
             except Exception as err:
-                get_logger(0).warn("Can't read DT %s from %s: %s", name, path, err)
+                #get_logger(0).warn("Can't read DT %s from %s: %s", name, path, err)
                 return None
         return self.__dt_cache[name]
 

kvmd/apps/kvmd/logreader.py

@@ -27,10 +27,11 @@ import time
 
 from typing import AsyncGenerator
 from xmlrpc.client import ServerProxy
-from supervisor.xmlrpc import SupervisorTransport
 
 from ...logging import get_logger
 
+us_systemd_journal = True
+
 try:
     module_name = "systemd.journal"
     module = __import__(module_name)
@@ -38,6 +39,12 @@ except ImportError:
     us_systemd_journal = False
     get_logger(0).error("Failed to import module: %s", module_name)
 
+try:
+    module_name = "supervisor.xmlrpc"
+    module = __import__(module_name)
+except ImportError:
+    us_systemd_journal = True
+
 # =====
 class LogReader:
     async def poll_log(self, seek: int, follow: bool) -> AsyncGenerator[dict, None]:
@@ -68,7 +75,7 @@ class LogReader:
                 else:
                     await asyncio.sleep(1)
         else:
-            server = ServerProxy('http://127.0.0.1',transport=SupervisorTransport(None, None, serverurl='unix:///tmp/supervisor.sock'))
+            server = ServerProxy('http://127.0.0.1',transport=supervisor.xmlrpc.SupervisorTransport(None, None, serverurl='unix:///tmp/supervisor.sock'))
             log_entries = server.supervisor.readLog(0,0)
             yield log_entries