From d4eb4263fac2047984f78368246bfde73b8387bc Mon Sep 17 00:00:00 2001 From: Valery Sinelnikov Date: Fri, 4 Oct 2024 14:13:12 +0400 Subject: [PATCH] Added use of timeout setting --- gpoa/frontend/cifs_applier.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gpoa/frontend/cifs_applier.py b/gpoa/frontend/cifs_applier.py index 2ee95c3..9e3fe17 100644 --- a/gpoa/frontend/cifs_applier.py +++ b/gpoa/frontend/cifs_applier.py @@ -152,8 +152,10 @@ class cifs_applier_user(applier_frontend): __template_auto = 'autofs_auto.j2' __template_mountpoints_hide = 'autofs_mountpoints_hide.j2' __template_auto_hide = 'autofs_auto_hide.j2' - __enable_home_link = 'Software\\BaseALT\\Policies\\GPUpdate\\DriveMapsHome' - __enable_home_link_user = 'Software\\BaseALT\\Policies\\GPUpdate\\DriveMapsHomeUser' + __enable_home_link = '/Software/BaseALT/Policies/GPUpdate/DriveMapsHome' + __enable_home_link_user = '/Software/BaseALT/Policies/GPUpdate/DriveMapsHomeUser' + _timeout_user_key = '/Software/BaseALT/Policies/GPUpdate/TimeoutUser' + _timeout_key = '/Software/BaseALT/Policies/GPUpdate/Timeout' __target_mountpoint = '/media/gpupdate' __target_mountpoint_user = '/run/media' __mountpoint_dirname = 'drives.system' @@ -277,6 +279,11 @@ class cifs_applier_user(applier_frontend): f.flush() autofs_settings = dict() + if self.username: + timeout = self.storage.get_entry(self._timeout_user_key) + else: + timeout = self.storage.get_entry(self._timeout_key) + autofs_settings['timeout'] = int(timeout) if timeout else 120 autofs_settings['home_dir'] = self.home autofs_settings['mntTarget'] = self.mntTarget autofs_settings['mount_file'] = self.user_config.resolve()