GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 09:01:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

common env variables

Browse Source
This commit is contained in:
Devaev Maxim
2020-10-03 03:34:55 +03:00
parent 872145590a
commit cccf44655a
14 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kvmd/plugins/msd/otg/__init__.py
View File

@@ -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:

6
kvmd/plugins/msd/otg/drive.py
View File

@@ -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}",
)

3
kvmd/plugins/msd/relay.py
View File

@@ -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])