diff options
| author | Devaev Maxim <[email protected]> | 2020-10-03 03:34:55 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2020-10-03 05:02:14 +0300 |
| commit | cccf44655aadc80d2d535033951e7af9ac65a271 (patch) | |
| tree | 1ea9607e91e0189a0d73e87bed39b14c29213585 /kvmd/plugins/msd | |
| parent | 872145590a3227b799ae7f5e7731dfc15967d63c (diff) | |
common env variables
Diffstat (limited to 'kvmd/plugins/msd')
| -rw-r--r-- | kvmd/plugins/msd/otg/__init__.py | 5 | ||||
| -rw-r--r-- | kvmd/plugins/msd/otg/drive.py | 6 | ||||
| -rw-r--r-- | kvmd/plugins/msd/relay.py | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kvmd/plugins/msd/otg/__init__.py b/kvmd/plugins/msd/otg/__init__.py index 2c795970..ef925065 100644 --- a/kvmd/plugins/msd/otg/__init__.py +++ b/kvmd/plugins/msd/otg/__init__.py @@ -44,7 +44,6 @@ from ....yamlconf import Option from ....validators.os import valid_abs_dir from ....validators.os import valid_command -from .... import tools from .... import aiotools from .... import aiofs @@ -139,7 +138,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes remount_cmd: List[str], unlock_cmd: List[str], - sysfs_prefix: str, gadget: str, # XXX: Not from options, see /kvmd/apps/kvmd/__init__.py for details ) -> None: @@ -150,7 +148,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes self.__remount_cmd = remount_cmd self.__unlock_cmd = unlock_cmd - self.__drive = Drive(sysfs_prefix, gadget, instance=0, lun=0) + self.__drive = Drive(gadget, instance=0, lun=0) self.__new_file: Optional[aiofiles.base.AiofilesContextManager] = None self.__new_file_written = 0 @@ -170,7 +168,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes "storage": Option("/var/lib/kvmd/msd", type=valid_abs_dir, unpack_as="storage_path"), "remount_cmd": Option([*sudo, "/usr/bin/kvmd-helper-otgmsd-remount", "{mode}"], type=valid_command), "unlock_cmd": Option([*sudo, "/usr/bin/kvmd-helper-otgmsd-unlock", "unlock"], type=valid_command), - "sysfs_prefix": Option("", type=tools.str_strip), } async def get_state(self) -> Dict: diff --git a/kvmd/plugins/msd/otg/drive.py b/kvmd/plugins/msd/otg/drive.py index ff91afcf..a0a0d82b 100644 --- a/kvmd/plugins/msd/otg/drive.py +++ b/kvmd/plugins/msd/otg/drive.py @@ -23,6 +23,8 @@ import os import errno +from .... import env + from .. import MsdOperationError @@ -34,9 +36,9 @@ class MsdDriveLockedError(MsdOperationError): # ===== class Drive: - def __init__(self, prefix: str, gadget: str, instance: int, lun: int) -> None: + def __init__(self, gadget: str, instance: int, lun: int) -> None: self.__path = os.path.join( - f"{prefix}/sys/kernel/config/usb_gadget", + f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget", gadget, f"functions/mass_storage.usb{instance}/lun.{lun}", ) diff --git a/kvmd/plugins/msd/relay.py b/kvmd/plugins/msd/relay.py index d1d91841..fe1c7784 100644 --- a/kvmd/plugins/msd/relay.py +++ b/kvmd/plugins/msd/relay.py @@ -39,6 +39,7 @@ import gpiod from ...logging import get_logger +from ... import env from ... import aiotools from ... import aiofs from ... import aiogp @@ -172,7 +173,7 @@ class _Gpio: assert self.__target_line is None assert self.__reset_line is None - self.__chip = gpiod.Chip(aiogp.DEVICE_PATH) + self.__chip = gpiod.Chip(env.GPIO_DEVICE_PATH) self.__target_line = self.__chip.get_line(self.__target_pin) self.__target_line.request("kvmd::msd-relay::target", gpiod.LINE_REQ_DIR_OUT, default_vals=[0]) |