diff --git a/docs/client.md b/docs/client.md index bcb1de33bcee0158a66928e5ad86b7c7fdaa0ac2..4f0c6c69025f870321e47d12dd5849bbbd9f56d9 100644 --- a/docs/client.md +++ b/docs/client.md @@ -346,12 +346,14 @@ First, you need to create the VM that will be used by your students during the e sudo apt-get install -y ... ``` - configuring the desktop to suit your needs and preferences, emptying the trash, etc. - Once done, you must shutdown the VM. <!-- - installing the QEMU Guest Agent with `sudo apt-get install qemu-guest-agent` (so you will be able to use the `vmshutdown` command) --> -1. Add the exam' specific files. All files (questions, code, etc.) can be copied from your local machine to the VM with `vmimportdir`. Below, we copy the "exam" local directory into the VM's student user's Desktop (`/home/student/Desktop`). Note that it copies the directory along all its subdirectories and files: +1. Add the exam' specific files to your VM. On your local system, simply create an archive (such as `.tar.gz` or `.zip`) of the files and directories you want to copy to your VM. Once completed, simply drag-and-drop it to your VM's desktop window. This will transfer the archive into your VM's desktop directory. Then, in the VM, simply decompress it by clicking on with the right button and selecting "Extract Here". + +<!-- +1. Add the exam' specific files. All files (questions, code, etc.) can be copied from your local machine to the VM with `vmimportdir`. However, this command requires the VM to be shutdown so make sure it's not running. Below, we copy the "exam" local directory into the VM's student user's Desktop (`/home/student/Desktop`). Note that it copies the directory along all its subdirectories and files: ``` vmimportdir "exam progsys oct2022" exam /home/student/Desktop ``` @@ -359,6 +361,7 @@ First, you need to create the VM that will be used by your students during the e ``` Successfully copied "exam" into "/home/student/Desktop" in VM "Exam ProgSys Oct2022" ``` +--> 1. Now that the VM is ready for the exam, create a template from it. The template must be `private` as we don't want anyone else to access it. Let's choose "Exam ProgSys Oct2022" as the template name (template creation takes several minutes, the larger the VM, the longer). The first argument is the template's name and the last is the VM ID from which the template must be created (as displayed when the VM was created earlier): ``` diff --git a/src/client/cmdTemplate/templateCreate.go.new b/src/client/cmdTemplate/templateCreate.go.new index 5c83bff4d57ea308434644e192838142e4d4c3e2..ef9543252c17979bd23d85cb0c527f764b62ca3c 100644 --- a/src/client/cmdTemplate/templateCreate.go.new +++ b/src/client/cmdTemplate/templateCreate.go.new @@ -127,6 +127,10 @@ func (cmd *Create)makeRequestForQCOW(qcowFile string, name string, access string // Old version but rusty stores the whole file to upload in RAM! // Waiting for a fix to the Rusty lib. +// TODO: test agin with a newer version of Rusty. +// also, look into these 2 tickets: +// https://github.com/go-resty/resty/issues/551 +// https://github.com/go-resty/resty/issues/309 func (cmd *Create)makeRequestForQCOW_old(qcowFile string, name string, access string) (*resty.Response, error) { client := g.GetInstance().Client host := g.GetInstance().Host