diff options
| author | Devaev Maxim <[email protected]> | 2020-10-03 06:43:17 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2020-10-03 06:43:23 +0300 |
| commit | 8b2a2eb7312c59ed5e543fd7b5cc91ae514e7333 (patch) | |
| tree | d9bcebb5d96e52d62763dd8a132af70813662479 | |
| parent | 9db6a4a6b415c34ea962376edbf1a615bb1b45bd (diff) | |
using sysfs prefix
| -rw-r--r-- | kvmd/apps/otg/__init__.py | 8 | ||||
| -rw-r--r-- | kvmd/apps/otgmsd/__init__.py | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/kvmd/apps/otg/__init__.py b/kvmd/apps/otg/__init__.py index 42f4a530..e9727cf3 100644 --- a/kvmd/apps/otg/__init__.py +++ b/kvmd/apps/otg/__init__.py @@ -37,6 +37,8 @@ from ...yamlconf import Section from ...validators import ValidatorError +from ... import env + from .. import init from .hid import Hid @@ -83,7 +85,7 @@ def _write_bytes(path: str, data: bytes) -> None: def _find_udc(udc: str) -> str: - udcs = sorted(os.listdir("/sys/class/udc")) + udcs = sorted(os.listdir(f"{env.SYSFS_PREFIX}/sys/class/udc")) if not udc: if len(udcs) == 0: raise RuntimeError("Can't find any UDC") @@ -170,7 +172,7 @@ def _cmd_start(config: Section) -> None: udc = _find_udc(config.otg.udc) logger.info("Creating gadget %r ...", config.otg.gadget) - gadget_path = join("/sys/kernel/config/usb_gadget", config.otg.gadget) + gadget_path = join(f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget", config.otg.gadget) _mkdir(gadget_path) _write(join(gadget_path, "idVendor"), f"0x{config.otg.vendor_id:X}") @@ -228,7 +230,7 @@ def _cmd_stop(config: Section) -> None: _check_config(config) - gadget_path = join("/sys/kernel/config/usb_gadget", config.otg.gadget) + gadget_path = join(f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget", config.otg.gadget) logger.info("Disabling gadget %r ...", config.otg.gadget) _write(join(gadget_path, "UDC"), "") diff --git a/kvmd/apps/otgmsd/__init__.py b/kvmd/apps/otgmsd/__init__.py index 9b7bd477..f504013d 100644 --- a/kvmd/apps/otgmsd/__init__.py +++ b/kvmd/apps/otgmsd/__init__.py @@ -34,13 +34,15 @@ from ...validators.basic import valid_bool from ...validators.basic import valid_int_f0 from ...validators.os import valid_abs_file +from ... import env + from .. import init # ===== def _make_param_path(gadget: str, instance: int, param: str) -> str: return os.path.join( - "/sys/kernel/config/usb_gadget", + f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget", gadget, f"functions/mass_storage.usb{instance}/lun.0", param, |