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, 10 insertions, 18 deletions

diff --git a/kpov_judge/tasks/smb_nfs/task.py b/kpov_judge/tasks/smb_nfs/task.py
index fe264cb..6da7c88 100644
--- a/kpov_judge/tasks/smb_nfs/task.py
+++ b/kpov_judge/tasks/smb_nfs/task.py
@@ -5,30 +5,22 @@
 # TODO: dokoncaj!
 instructions = {
     'si':u"""
-Postavi dva navidezna računalnika (simpleArbiterDhcp in FileServer). Na SimpleArbiterDhcp poišči imenik
-Mapa ter preberi pot NFS_POT ter ime imenika v skupni rabi SAMBA_SHARE. Skopiraj datoteke iz imenika Mapa,
-na FileServer. Poskrbi, da bo imenik z datotekami dostopen prek NFS v imeniku NFS_POT in prek SMB na imeniku v skupni
-rabi SAMBA_SHARE. SimpleArbiterDhcp naj ima prek NFS pravico pisati po imeniku.
+Postavi dva navidezna računalnika (simpleArbiterDhcp in FileServer).
 
-NFS_POT je pot do nekega imenika in je za vsakega studenta drugacna. Ustvari 
-mapo in poskrbi da bo dostopna prek protokolov NFS in SMB. Vanj skopiraj
-datoteke iz imenika MAPA (ta mapa naj vsebuje datoteko z imenom SHARED_FILENAME in vsebino SHARED_FILENAME_CONETENT), ki bosta za vsakega studenta drugacni.
-Naloga za studenta, ki pise gen_params() in params_meta je da nazreba opisane parametre.
-V task() napisi zaporedje ukazov, ki bodo preverili, ali je student res postavil delujoca streznika NFS in SMB in ali je nanju postavil datoteko SHARED_FILENAME. Vecina logike te funkcije gre v task_check.
-Izpis teh rezultatov spravi v results. Naloga student, ki pise task_check(results, params) je da napise funkcijo, ki pregleda ustvarjeni results in pove, ali je student opravil nalogo v skladu z navodili.
+Poskrbi, da bo imenik {NFS_MOUNT} na FileServer dostopen prek NFS in 
+prek SMB kot imenik v skupni rabi {SMB_SHARENAME}. 
+Ime SMB strežnika nastavite na {FILESERVER_NAME}.
+
+SimpleArbiterDhcp naj ima prek NFS pravico pisati po imeniku.
 """,
 'en':u"""
-
 Set up two virtual computers (simpleArbiterDhcp and FileServer).
 
-On SimpleArbiterDhcp find directory Mapa, read path NFS_POT and name of directory in shared folder SAMBA_SHARE.
-
-Copy files from directory Mapa to FileServer.
-
-Make sure that the directory with files will be available over NFS (which is in directory NFS_POT) and over SMB, on directory in shared folder SAMBA_SHARE.
-
-SimpleArbiterDhcp should have the right to write in directory, using NFS.
+Make sure that the directory {NFS_MOUNT} on FileServer is accessible
+over NFS and over SMB under the sharename {SMB_SHARENAME}.
+Set the SMB server name to {FILESERVER_NAME}.
 
+SimpleArbiterDhcp should have write access to {NFS_MOUNT} over NFS.
 """
 }