diff options
-rw-r--r-- | kvmd/apps/otg/__init__.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kvmd/apps/otg/__init__.py b/kvmd/apps/otg/__init__.py index 55076ff9..ffda8443 100644 --- a/kvmd/apps/otg/__init__.py +++ b/kvmd/apps/otg/__init__.py @@ -68,11 +68,16 @@ def _rmdir(path: str) -> None: os.rmdir(path) -def _unlink(path: str) -> None: - get_logger().info("RM ------ %s", path) +def _unlink(path: str, optional: bool=False) -> None: + 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) + def _write(path: str, text: str, optional: bool=False) -> None: logger = get_logger() 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) _write(join(gadget_path, "UDC"), "") - if config.otg.devices.ethernet.driver == "rndis": - _unlink(join(gadget_path, "os_desc/c.1")) + _unlink(join(gadget_path, "os_desc/c.1"), True) config_path = join(gadget_path, "configs/c.1") for func in os.listdir(config_path): |