From d3e8f24b4da66059058627168f3f71eaf7626a93 Mon Sep 17 00:00:00 2001 From: "gasperfele@fri1.uni-lj.si" Date: Thu, 9 Apr 2015 18:00:43 +0000 Subject: fixed disk template names git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@298 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414 --- .../tasks/isc_dhcp_live_boot/howtos/images/mini.iso | Bin 40894464 -> 0 bytes kpov_judge/tasks/isc_dhcp_live_boot/task.py | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 kpov_judge/tasks/isc_dhcp_live_boot/howtos/images/mini.iso (limited to 'kpov_judge/tasks/isc_dhcp_live_boot') diff --git a/kpov_judge/tasks/isc_dhcp_live_boot/howtos/images/mini.iso b/kpov_judge/tasks/isc_dhcp_live_boot/howtos/images/mini.iso deleted file mode 100644 index 33c0dc9..0000000 Binary files a/kpov_judge/tasks/isc_dhcp_live_boot/howtos/images/mini.iso and /dev/null differ diff --git a/kpov_judge/tasks/isc_dhcp_live_boot/task.py b/kpov_judge/tasks/isc_dhcp_live_boot/task.py index 0e86c11..eb4ad01 100644 --- a/kpov_judge/tasks/isc_dhcp_live_boot/task.py +++ b/kpov_judge/tasks/isc_dhcp_live_boot/task.py @@ -45,7 +45,7 @@ Both BootableCLientA and BootableClientB should be diskless. computers = { 'DHCPServer': { 'disks': [ - { 'name': 'DHCPServer', + { 'name': 'student-DHCPServer', }, { 'name': 'bootable_usb', 'options':{'readonly': True}, @@ -196,7 +196,7 @@ def task_check(results, params): def prepare_disks(templates, params): # d = templates['simpleArbiterDhcp'] - d = templates['DHCPServer'] + d = templates['student-DHCPServer'] s = """# use this exact config for your booting clients. # search path for the c32 support libraries (libcom32, libutil etc.) path @@ -206,7 +206,7 @@ prompt 0 timeout 0 # {}""".format(params['TFTP_STRING']) d.write('/mnt/syslinux.cfg', s) - d = templates['SimpleArbiter'] + d = templates['simpleArbiterGW'] s = """auto lo iface lo inet loopback -- cgit v1.2.1