summaryrefslogtreecommitdiff
path: root/kpov_judge/tasks/smb_nfs
diff options
context:
space:
mode:
authorgasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>2016-10-01 21:46:34 +0000
committergasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>2016-10-01 21:46:34 +0000
commitfa8934667ad8eae30c81081bbaa868b227c119ed (patch)
treed2a69178cfb693c0da0ffbefaff2da70a64f52f5 /kpov_judge/tasks/smb_nfs
parent7210b74d6241a4264532aaaa2e1d771eaca4e073 (diff)
added a global_params parameter to prepare_disks so that the task_name, username and task_url are pre-entered on the arbiters
git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@351 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414
Diffstat (limited to 'kpov_judge/tasks/smb_nfs')
-rw-r--r--kpov_judge/tasks/smb_nfs/task.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/kpov_judge/tasks/smb_nfs/task.py b/kpov_judge/tasks/smb_nfs/task.py
index 244ac76..7143cf0 100644
--- a/kpov_judge/tasks/smb_nfs/task.py
+++ b/kpov_judge/tasks/smb_nfs/task.py
@@ -135,13 +135,13 @@ def task_check(results, params):
score += 2
return score, hints
-def prepare_disks(templates, params):
+def prepare_disks(templates, task_params, global_params):
d = templates['student-fileserver']
d.mkdir("/srv/nfs")
- d.mkdir(params['NFS_MOUNT'])
- d.write(params['NFS_MOUNT'] + "/" + params["SHARED_FILENAME"],
- params["SHARED_CONTENT"])
+ d.mkdir(task_params['NFS_MOUNT'])
+ d.write(task_params['NFS_MOUNT'] + "/" + task_params["SHARED_FILENAME"],
+ task_params["SHARED_CONTENT"])
d = templates['simpleArbiterDhcpGW']
d.mkdir('/mnt/nfs')
d.mkdir('/mnt/smb')
-
+ write_default_config(templates['simpleArbiterDhcpGW'], global_params)