From 04f9bbe56894e3d4a5cc43f530099266e76f987b Mon Sep 17 00:00:00 2001
From: mfunkey <71608624+mfunkey@users.noreply.github.com>
Date: Thu, 6 Jan 2022 03:01:45 +0100
Subject: Make kvmd-net start/stop work without error while changing
 configuration (#76)

---
 kvmd/apps/otg/__init__.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'kvmd/apps')

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):
-- 
cgit v1.2.3