diff options
| author | gasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414> | 2016-10-01 21:46:34 +0000 |
|---|---|---|
| committer | gasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414> | 2016-10-01 21:46:34 +0000 |
| commit | fa8934667ad8eae30c81081bbaa868b227c119ed (patch) | |
| tree | d2a69178cfb693c0da0ffbefaff2da70a64f52f5 /kpov_judge/tasks/isc_dhcp_live_boot | |
| parent | 7210b74d6241a4264532aaaa2e1d771eaca4e073 (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/isc_dhcp_live_boot')
| -rw-r--r-- | kpov_judge/tasks/isc_dhcp_live_boot/task.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kpov_judge/tasks/isc_dhcp_live_boot/task.py b/kpov_judge/tasks/isc_dhcp_live_boot/task.py index eb4ad01..303f2e1 100644 --- a/kpov_judge/tasks/isc_dhcp_live_boot/task.py +++ b/kpov_judge/tasks/isc_dhcp_live_boot/task.py @@ -194,7 +194,7 @@ def task_check(results, params): hints += ["tftp wrong"] return score, hints -def prepare_disks(templates, params): +def prepare_disks(templates, task_params, global_params): # d = templates['simpleArbiterDhcp'] d = templates['student-DHCPServer'] s = """# use this exact config for your booting clients. @@ -204,7 +204,7 @@ include menu.cfg default vesamenu.c32 prompt 0 timeout 0 -# {}""".format(params['TFTP_STRING']) +# {}""".format(task_params['TFTP_STRING']) d.write('/mnt/syslinux.cfg', s) d = templates['simpleArbiterGW'] s = """auto lo @@ -216,6 +216,6 @@ iface eth0 inet dhcp iface eth1 inet static address {} netmask 255.192.0.0 -""".format(params['IP_GW']) +""".format(task_params['IP_GW']) d.write("/etc/interfaces", s) - + write_default_config(templates['simpleArbiterGW'], global_params) |