From 92e0a6b4833351b645a3b6aa9de9f051e2fc2a47 Mon Sep 17 00:00:00 2001 From: riad nbou Date: Fri, 21 Jul 2023 17:48:29 +0100 Subject: [PATCH 1/4] remove restriction of virtual box and "ACPI shutdown" task --- subjects/linux/README.md | 10 ++++++---- subjects/linux/audit/README.md | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/subjects/linux/README.md b/subjects/linux/README.md index fea756ee39..16547abbbe 100644 --- a/subjects/linux/README.md +++ b/subjects/linux/README.md @@ -24,11 +24,13 @@ It will also allow you to learn some tricks to better control your machine and s ### Virtualization -To practice in a standardized way and without the risk of altering your own operating system, install the hypervisor [VirtualBox](https://www.virtualbox.org/wiki/Downloads). +To practice in a standardized manner and without the risk of altering your own operating system, you should install a virtualization application that is compatible with your chip architecture. -This will allow you to run virtual machines (virtual computers accessible through a window). +For X86-64 chips, we recommend using [VirtualBox](https://www.virtualbox.org/wiki/Downloads). For Apple Silicon chips, we recommend using [UTM](https://mac.getutm.app/). -This way, whatever your operating system, you can, for example, run Linux, Windows & macOS in 3 separate windows at the same time. +This allows you to run virtual machines - virtual computers accessible through a window. This way, you can run Linux, Windows, and macOS in separate windows at the same time, regardless of your operating system. + +### Installation ### Installation @@ -42,4 +44,4 @@ Install Debian (ISO installer "netinst" is recommended) in a VM (Virtual Machine ### Shut down -Gracefully close the VM using "ACPI Shutdown". It's like pressing the power button of a real computer. +close the VM using the command line after login in the console \ No newline at end of file diff --git a/subjects/linux/audit/README.md b/subjects/linux/audit/README.md index 1eddab2016..0aed5e5dfe 100644 --- a/subjects/linux/audit/README.md +++ b/subjects/linux/audit/README.md @@ -8,6 +8,6 @@ ###### Does the virtual machine boot Debian properly (in less than 2 minutes)? -##### After the boot is completed, ask the auditee to shutdown his VM with the ACPI Shutdown. +##### After the boot is completed, ask the auditee to login in the console and exicute the command to shutdown the VM. -###### Does the system react to the ACPI Shutdown and does the virtual machine stop? +###### Could the auditee log in and shut down the VM using a command line from the console? From efcd42947a8532acd19a56d3cf241428be77bdc7 Mon Sep 17 00:00:00 2001 From: riad nbou Date: Mon, 31 Jul 2023 09:54:09 +0100 Subject: [PATCH 2/4] remove the specification of virtualbox from audit --- subjects/linux/audit/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subjects/linux/audit/README.md b/subjects/linux/audit/README.md index 0aed5e5dfe..5db3dc6543 100644 --- a/subjects/linux/audit/README.md +++ b/subjects/linux/audit/README.md @@ -1,8 +1,8 @@ #### Functional -##### Ask the auditee to start VirtualBox. +##### Ask the auditee to start the virtualization software. -###### Is VirtualBox correctly installed on the auditee's machine? +###### Is the virtualization software correctly installed on the auditee's machine? ##### Ask the auditee to show you his VM with a version of debian already installed. From f6fa7a7a65330835db3d485cc62220650d0d24f7 Mon Sep 17 00:00:00 2001 From: riad nbou Date: Mon, 31 Jul 2023 09:57:22 +0100 Subject: [PATCH 3/4] replace application with software --- subjects/linux/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subjects/linux/README.md b/subjects/linux/README.md index 16547abbbe..8fda61421d 100644 --- a/subjects/linux/README.md +++ b/subjects/linux/README.md @@ -24,7 +24,7 @@ It will also allow you to learn some tricks to better control your machine and s ### Virtualization -To practice in a standardized manner and without the risk of altering your own operating system, you should install a virtualization application that is compatible with your chip architecture. +To practice in a standardized manner and without the risk of altering your own operating system, you should install a virtualization software that is compatible with your chip architecture. For X86-64 chips, we recommend using [VirtualBox](https://www.virtualbox.org/wiki/Downloads). For Apple Silicon chips, we recommend using [UTM](https://mac.getutm.app/). From ab73a0310fb95db14259ee836169d70269e15bcb Mon Sep 17 00:00:00 2001 From: freeworldwhoo <39562040+freeworldwhoo@users.noreply.github.com> Date: Mon, 30 Oct 2023 15:06:51 +0100 Subject: [PATCH 4/4] CON-1836 fix typo --- subjects/linux/audit/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subjects/linux/audit/README.md b/subjects/linux/audit/README.md index 5db3dc6543..174c79f9b8 100644 --- a/subjects/linux/audit/README.md +++ b/subjects/linux/audit/README.md @@ -8,6 +8,6 @@ ###### Does the virtual machine boot Debian properly (in less than 2 minutes)? -##### After the boot is completed, ask the auditee to login in the console and exicute the command to shutdown the VM. +##### After the boot is completed, ask the auditee to login in the console and execute the command to shutdown the VM. ###### Could the auditee log in and shut down the VM using a command line from the console?