GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-17 11:50:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make kvmd-net start/stop work without error while changing configuration (#76)

Browse Source
This commit is contained in:
mfunkey 2022-01-06 03:01:45 +01:00 committed by GitHub
parent 9f44a120a7
commit 04f9bbe568
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kvmd/apps/otg/__init__.py
View File

@ -68,11 +68,16 @@ def _rmdir(path: str) -> None:
os.rmdir(path) os.rmdir(path)
def _unlink(path: str) -> None: def _unlink(path: str, optional: bool=False) -> None:
get_logger().info("RM ------ %s", path) logger = get_logger()
if optional and not os.access(path, os.F_OK):
logger.info("SKIP ---- %s", path)
return
logger.info("RM ------ %s", path)
os.unlink(path) os.unlink(path)
def _write(path: str, text: str, optional: bool=False) -> None: def _write(path: str, text: str, optional: bool=False) -> None:
logger = get_logger() logger = get_logger()
if optional and not os.access(path, os.F_OK): if optional and not os.access(path, os.F_OK):
@ -267,8 +272,7 @@ def _cmd_stop(config: Section) -> None:
logger.info("Disabling gadget %r ...", config.otg.gadget) logger.info("Disabling gadget %r ...", config.otg.gadget)
_write(join(gadget_path, "UDC"), "") _write(join(gadget_path, "UDC"), "")
if config.otg.devices.ethernet.driver == "rndis": _unlink(join(gadget_path, "os_desc/c.1"), True)
_unlink(join(gadget_path, "os_desc/c.1"))
config_path = join(gadget_path, "configs/c.1") config_path = join(gadget_path, "configs/c.1")
for func in os.listdir(config_path): for func in os.listdir(config_path):