Fixed instructions

git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@288 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414

1 files changed, 25 insertions, 15 deletions

diff --git a/kpov_judge/tasks/isc_dhcp_live_boot/task.py b/kpov_judge/tasks/isc_dhcp_live_boot/task.py
index 7061108..1f1278b 100644
--- a/kpov_judge/tasks/isc_dhcp_live_boot/task.py
+++ b/kpov_judge/tasks/isc_dhcp_live_boot/task.py
@@ -7,29 +7,39 @@
 instructions = {
     'si':u"""
 Postavi štiri navidezne računalnike - simpleArbiter, DHCP_server,
-BootableClientA ter BootableClientB. Na simpleArbiter preberi naslove IP_GW, IP_DHCP,
-IP_B ter ime datoteke BOOT_FNAME.
+BootableClientA ter BootableClientB.
 
-Na DHCP_server postavi DHCP strežnik s pomočjo ISC dhcp 3 na naslovu IP_DHCP.
-SimpleArbiter naj dobi IP_GW. DHCP_server naj ga uporabi kot gateway.
+Na DHCP_server postavi DHCP strežnik s pomočjo ISC dhcp 3 na naslovu {IP_DHCP}.
+SimpleArbiter naj dobi {IP_GW}. DHCP_server naj ga uporabi kot gateway.
 
-Če se zaganja BootableClientB, naj se sistem zažene v datoteko z imenom BOOT_FNAME.
-Če se zaganja katerikoli drug, naj se sistem zažene z live USB in dobi svoj IP. USB je priklopljen na DHCP_server. Datoteke z nastavitvami za PXELinux MORAJO biti dostopne na korenskem imeniku strežnika TFTP.
+Če se zaganja BootableClientB, naj se sistem zažene v datoteko z imenom {BOOT_FNAME}.
+Če se zaganja katerikoli drug, naj se sistem zažene z živega USB, ki ga predstavlja
+slika diska bootable_usb. 
+
+Živi USB priklopite na na DHCP_server ter z njega poberite datoteke, potrebne za zagon.
+Datoteke z nastavitvami za PXELinux, ki jih najdete na živem USB,
+MORAJO biti dostopne na korenskem imeniku strežnika TFTP.
 
 Tako BootableClientA kot BootableClientB naj bosta brez diskov.
 """, 
-    
-    'en': """Set up 4 virtual computers - simpleArbiter, DHCP_server, BootableClientA and 
-BootableClientB. On simpleArbiter read the following IPs: IP_GW, IP_DHCP, IP_B as well as the name of the file BOOT_FNAME.
+    # TODO: write a proper translation. The one that used to be here was just wrong.
+    'en': """Set up 4 virtual computers - simpleArbiter, DHCP_server, 
+BootableClientA and BootableClientB.
 
-On DHCP server install a DHCP server using ISC DHCP 3 for the address IP_DHCP.
-Simple Arbiter should be given the IP_GW address. DHCP_server should user it a s gateway.
+On DHCP_server, set up a DHCP server using ISC dhcp 3. Set the IP address of
+this server to {IP_DHCP}. If SimpleArbiter requests an IP, have the DHCP server
+serve it {IP_GW}. DHCP_server should use SimpleArbiter as it's gateway.
 
-If the BootableClientB is starting, let it boot into a file called BOOT_FNAME.
-If any other machine is starting, let it boot suign a live USB and get it's IP. USB should be connected to DHCP_server. Files with PXElinux configuration settings must be accesible from the root directory on the TFTP server.
+If BootableClientB tries to boot over the network, have the DHCP server tell it 
+to boot from the file {BOOT_FNAME}. If any other system tries to boot over the
+network, have it boot from a live USB drive represented by the disk image
+bootable_usb.
 
-Both BootableCLientA and B should be diskless.
+Connect the live USB to DHCP_server and copy the files neccessarry for it to
+boot. The PXELinux configuration files must be the same as the ones found on
+the live USB and MUST be accessible on the TFTP server root.
 
+Both BootableCLientA and BootableClientB should be diskless.
 """
 }
 computers = {
@@ -158,7 +168,7 @@ def task_check(results, params):
     #POINTS FOR EACH TASK MAY BE ADJUSTED IN THE FUTURE
     if results['dhcping_other'].find(params['IP_DHCP']) >= 0:
         score += 1
-    if results['dhcping_other'].find(params['IP_DHCP']) >= 0:
+    if results['dhcping_SA'].find(params['IP_DHCP']) >= 0:
         score += 1
     p = re.search(r"FNAME:(.*)\r",
         results['dhcpdump_other_reply'])