find pst partition by fstab

This commit is contained in:
Maxim Devaev 2022-11-07 17:00:35 +03:00
parent 29bd1e2f6f
commit a4f3ee79e6
2 changed files with 2 additions and 3 deletions

View File

@ -500,7 +500,6 @@ def _get_config_scheme() -> dict:
" referer='%{Referer}i'; user_agent='%{User-Agent}i'"), " referer='%{Referer}i'; user_agent='%{User-Agent}i'"),
}, },
"storage": Option("/var/lib/kvmd/pst", type=valid_abs_dir, unpack_as="storage_path"),
"ro_retries_delay": Option(10.0, type=valid_float_f01), "ro_retries_delay": Option(10.0, type=valid_float_f01),
"ro_cleanup_delay": Option(3.0, type=valid_float_f01), "ro_cleanup_delay": Option(3.0, type=valid_float_f01),

View File

@ -31,6 +31,7 @@ from ...logging import get_logger
from ... import tools from ... import tools
from ... import aiotools from ... import aiotools
from ... import aiohelpers from ... import aiohelpers
from ... import fstab
from ...htserver import exposed_http from ...htserver import exposed_http
from ...htserver import exposed_ws from ...htserver import exposed_ws
@ -42,7 +43,6 @@ from ...htserver import HttpServer
class PstServer(HttpServer): # pylint: disable=too-many-arguments,too-many-instance-attributes class PstServer(HttpServer): # pylint: disable=too-many-arguments,too-many-instance-attributes
def __init__( # pylint: disable=too-many-arguments,too-many-locals def __init__( # pylint: disable=too-many-arguments,too-many-locals
self, self,
storage_path: str,
ro_retries_delay: float, ro_retries_delay: float,
ro_cleanup_delay: float, ro_cleanup_delay: float,
remount_cmd: list[str], remount_cmd: list[str],
@ -50,7 +50,7 @@ class PstServer(HttpServer): # pylint: disable=too-many-arguments,too-many-inst
super().__init__() super().__init__()
self.__data_path = os.path.join(storage_path, "data") self.__data_path = os.path.join(fstab.find_partition(fstab.PartitionType.PST).root_path, "data")
self.__ro_retries_delay = ro_retries_delay self.__ro_retries_delay = ro_retries_delay
self.__ro_cleanup_delay = ro_cleanup_delay self.__ro_cleanup_delay = ro_cleanup_delay
self.__remount_cmd = remount_cmd self.__remount_cmd = remount_cmd