From 416adccd2980e6e8e47a5791c0e0b43365a794b0 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Tue, 1 Oct 2024 11:55:06 +0300 Subject: [PATCH 1/7] update quickstart docs --- docs/development/quickstart.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/development/quickstart.md b/docs/development/quickstart.md index ddec81db5..4c586a39a 100644 --- a/docs/development/quickstart.md +++ b/docs/development/quickstart.md @@ -8,11 +8,11 @@ ## Starting a local zos node -* Make sure `qemu` and `dnsmasq` are installed -* [Create a farm](https://manual.grid.tf/farmers/3node_building/1_create_farm.html) +* Make sure `qemu` is installed +* [Create a farm](https://manual.grid.tf/documentation/farmers/3node_building/1_create_farm.html#create-a-farm) * [Download a zos image](https://bootstrap.grid.tf/kernel/zero-os-development-zos-v3-generic-7e587e499a.efi) * Make sure `zos0` bridge is allowed by qemu, you can add `allow zos0` in `/etc/qemu/bridge.conf` (create the file if it's not there) -* Setup the network using this script [this script](../../qemu/net.sh) +* Setup the network using this script [this script](../../qemu/net.sh) Or you can `cd qemu` then run `make net` Then, inside zos repository @@ -20,10 +20,10 @@ Then, inside zos repository make -C cmds cd qemu mv ./zos.efi -sudo ./vm.sh -n node-01 -c "farmer_id= printk.devmsg=on runmode=dev" +make run id= user= ``` -You should see the qemu console and boot logs, wait for awhile and you can [browse farms](https://dashboard.dev.grid.tf/explorer/farms) to see your node is added/detected automatically. +You should see the qemu console and boot logs, wait for awhile and you can [browse your farms](https://dashboard.dev.grid.tf/#/farms/your-farms/) to see your node is added/detected automatically. To stop the machine you can do `Control + a` then `x`. From 4542baf53dd88efc84752ac1b0b1bf0b3470b5ff Mon Sep 17 00:00:00 2001 From: nabil salah Date: Sun, 13 Oct 2024 18:13:39 +0300 Subject: [PATCH 2/7] refactor: use make prepare --- docs/development/quickstart.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/development/quickstart.md b/docs/development/quickstart.md index 4c586a39a..e26c9289e 100644 --- a/docs/development/quickstart.md +++ b/docs/development/quickstart.md @@ -10,7 +10,7 @@ * Make sure `qemu` is installed * [Create a farm](https://manual.grid.tf/documentation/farmers/3node_building/1_create_farm.html#create-a-farm) -* [Download a zos image](https://bootstrap.grid.tf/kernel/zero-os-development-zos-v3-generic-7e587e499a.efi) +* [Download a zos image](https://bootstrap.grid.tf/kernel/zero-os-development-zos-v3-generic-7e587e499a.efi) (Optional) * Make sure `zos0` bridge is allowed by qemu, you can add `allow zos0` in `/etc/qemu/bridge.conf` (create the file if it's not there) * Setup the network using this script [this script](../../qemu/net.sh) Or you can `cd qemu` then run `make net` @@ -19,7 +19,18 @@ Then, inside zos repository ``` make -C cmds cd qemu +``` +If you downloaded your zos image move it here +``` mv ./zos.efi +``` +or you can simple run this command +``` +make prepare +mv dev.efi zos.efi +``` + +``` make run id= user= ``` From a83a1bc0625cbd4ddee57a1c6f55df804a654ba4 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Tue, 1 Oct 2024 11:55:06 +0300 Subject: [PATCH 3/7] update quickstart docs --- docs/development/quickstart.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/development/quickstart.md b/docs/development/quickstart.md index ddec81db5..4c586a39a 100644 --- a/docs/development/quickstart.md +++ b/docs/development/quickstart.md @@ -8,11 +8,11 @@ ## Starting a local zos node -* Make sure `qemu` and `dnsmasq` are installed -* [Create a farm](https://manual.grid.tf/farmers/3node_building/1_create_farm.html) +* Make sure `qemu` is installed +* [Create a farm](https://manual.grid.tf/documentation/farmers/3node_building/1_create_farm.html#create-a-farm) * [Download a zos image](https://bootstrap.grid.tf/kernel/zero-os-development-zos-v3-generic-7e587e499a.efi) * Make sure `zos0` bridge is allowed by qemu, you can add `allow zos0` in `/etc/qemu/bridge.conf` (create the file if it's not there) -* Setup the network using this script [this script](../../qemu/net.sh) +* Setup the network using this script [this script](../../qemu/net.sh) Or you can `cd qemu` then run `make net` Then, inside zos repository @@ -20,10 +20,10 @@ Then, inside zos repository make -C cmds cd qemu mv ./zos.efi -sudo ./vm.sh -n node-01 -c "farmer_id= printk.devmsg=on runmode=dev" +make run id= user= ``` -You should see the qemu console and boot logs, wait for awhile and you can [browse farms](https://dashboard.dev.grid.tf/explorer/farms) to see your node is added/detected automatically. +You should see the qemu console and boot logs, wait for awhile and you can [browse your farms](https://dashboard.dev.grid.tf/#/farms/your-farms/) to see your node is added/detected automatically. To stop the machine you can do `Control + a` then `x`. From 65e6afb3548dcfc903fc3072da4b2fe0cecbcf94 Mon Sep 17 00:00:00 2001 From: nabil salah Date: Sun, 13 Oct 2024 18:13:39 +0300 Subject: [PATCH 4/7] refactor: use make prepare --- docs/development/quickstart.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/development/quickstart.md b/docs/development/quickstart.md index 4c586a39a..e26c9289e 100644 --- a/docs/development/quickstart.md +++ b/docs/development/quickstart.md @@ -10,7 +10,7 @@ * Make sure `qemu` is installed * [Create a farm](https://manual.grid.tf/documentation/farmers/3node_building/1_create_farm.html#create-a-farm) -* [Download a zos image](https://bootstrap.grid.tf/kernel/zero-os-development-zos-v3-generic-7e587e499a.efi) +* [Download a zos image](https://bootstrap.grid.tf/kernel/zero-os-development-zos-v3-generic-7e587e499a.efi) (Optional) * Make sure `zos0` bridge is allowed by qemu, you can add `allow zos0` in `/etc/qemu/bridge.conf` (create the file if it's not there) * Setup the network using this script [this script](../../qemu/net.sh) Or you can `cd qemu` then run `make net` @@ -19,7 +19,18 @@ Then, inside zos repository ``` make -C cmds cd qemu +``` +If you downloaded your zos image move it here +``` mv ./zos.efi +``` +or you can simple run this command +``` +make prepare +mv dev.efi zos.efi +``` + +``` make run id= user= ``` From 7ad69e836d04d6e886827ffdcb148eeb0b702c9f Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Tue, 1 Oct 2024 11:55:06 +0300 Subject: [PATCH 5/7] update quickstart docs --- docs/development/quickstart.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/development/quickstart.md b/docs/development/quickstart.md index ddec81db5..4c586a39a 100644 --- a/docs/development/quickstart.md +++ b/docs/development/quickstart.md @@ -8,11 +8,11 @@ ## Starting a local zos node -* Make sure `qemu` and `dnsmasq` are installed -* [Create a farm](https://manual.grid.tf/farmers/3node_building/1_create_farm.html) +* Make sure `qemu` is installed +* [Create a farm](https://manual.grid.tf/documentation/farmers/3node_building/1_create_farm.html#create-a-farm) * [Download a zos image](https://bootstrap.grid.tf/kernel/zero-os-development-zos-v3-generic-7e587e499a.efi) * Make sure `zos0` bridge is allowed by qemu, you can add `allow zos0` in `/etc/qemu/bridge.conf` (create the file if it's not there) -* Setup the network using this script [this script](../../qemu/net.sh) +* Setup the network using this script [this script](../../qemu/net.sh) Or you can `cd qemu` then run `make net` Then, inside zos repository @@ -20,10 +20,10 @@ Then, inside zos repository make -C cmds cd qemu mv ./zos.efi -sudo ./vm.sh -n node-01 -c "farmer_id= printk.devmsg=on runmode=dev" +make run id= user= ``` -You should see the qemu console and boot logs, wait for awhile and you can [browse farms](https://dashboard.dev.grid.tf/explorer/farms) to see your node is added/detected automatically. +You should see the qemu console and boot logs, wait for awhile and you can [browse your farms](https://dashboard.dev.grid.tf/#/farms/your-farms/) to see your node is added/detected automatically. To stop the machine you can do `Control + a` then `x`. From 6ea2e6a99f3ac052c6577fa29b2a82ead9e13f71 Mon Sep 17 00:00:00 2001 From: nabil salah Date: Sun, 13 Oct 2024 18:13:39 +0300 Subject: [PATCH 6/7] refactor: use make prepare --- docs/development/quickstart.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/development/quickstart.md b/docs/development/quickstart.md index 4c586a39a..e26c9289e 100644 --- a/docs/development/quickstart.md +++ b/docs/development/quickstart.md @@ -10,7 +10,7 @@ * Make sure `qemu` is installed * [Create a farm](https://manual.grid.tf/documentation/farmers/3node_building/1_create_farm.html#create-a-farm) -* [Download a zos image](https://bootstrap.grid.tf/kernel/zero-os-development-zos-v3-generic-7e587e499a.efi) +* [Download a zos image](https://bootstrap.grid.tf/kernel/zero-os-development-zos-v3-generic-7e587e499a.efi) (Optional) * Make sure `zos0` bridge is allowed by qemu, you can add `allow zos0` in `/etc/qemu/bridge.conf` (create the file if it's not there) * Setup the network using this script [this script](../../qemu/net.sh) Or you can `cd qemu` then run `make net` @@ -19,7 +19,18 @@ Then, inside zos repository ``` make -C cmds cd qemu +``` +If you downloaded your zos image move it here +``` mv ./zos.efi +``` +or you can simple run this command +``` +make prepare +mv dev.efi zos.efi +``` + +``` make run id= user= ``` From 9911a9f8fbfcf7574669806b375a8d309cd38128 Mon Sep 17 00:00:00 2001 From: nabil salah Date: Sun, 20 Oct 2024 15:06:59 +0300 Subject: [PATCH 7/7] refactor: typo in quickstart docs --- docs/development/quickstart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/development/quickstart.md b/docs/development/quickstart.md index e26c9289e..0f357d2e2 100644 --- a/docs/development/quickstart.md +++ b/docs/development/quickstart.md @@ -24,7 +24,7 @@ If you downloaded your zos image move it here ``` mv ./zos.efi ``` -or you can simple run this command +Or you can run this commands ``` make prepare mv dev.efi zos.efi