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

v2 testing

Browse Source
This commit is contained in:
Devaev Maxim
2019-11-07 06:42:48 +03:00
parent 10f8c2b335
commit 8abe4b1ac9
5 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,6 +137,7 @@ 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:
@@ -147,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(gadget, instance=0, lun=0)
self.__drive = Drive(sysfs_prefix, gadget, instance=0, lun=0)
self.__new_file: Optional[aiofiles.base.AiofilesContextManager] = None
self.__new_file_written = 0
@@ -164,9 +165,10 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
def get_plugin_options(cls) -> Dict:
sudo = ["/usr/bin/sudo", "--non-interactive"]
return {
"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),
"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=(lambda arg: str(arg).strip())),
}
async def get_state(self) -> Dict:

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

@@ -34,9 +34,9 @@ class MsdDriveLockedError(MsdOperationError):
# =====
class Drive:
def __init__(self, gadget: str, instance: int, lun: int) -> None:
def __init__(self, prefix: str, gadget: str, instance: int, lun: int) -> None:
self.__path = os.path.join(
"/sys/kernel/config/usb_gadget",
f"{prefix}/sys/kernel/config/usb_gadget",
gadget,
f"functions/mass_storage.usb{instance}/lun.{lun}",
)