summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Soller <jackpot51@gmail.com>2017-02-23 18:12:40 -0700
committerJeremy Soller <jackpot51@gmail.com>2017-02-23 18:12:40 -0700
commit77dab17722eabf2bb6accbe1c41086fc4173158e (patch)
tree1612bca6a9f3b4d0700ef12bbf670f8f2b87424f
parente6725019cd605f68dc6a31fe6c268c4a4b27a55d (diff)
parent2f1692ba421ccc44e03bb77dcc6ac24e1a6f5a75 (diff)
Merge branch 'master' of https://github.com/redox-os/redox0.1.0
-rw-r--r--README.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/README.md b/README.md
index 8c42dd3..7e28f81 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
**Redox** is an operating system written in Rust, a language with focus on safety and high performance. Redox, following the microkernel design, aims to be secure, usable, and free. Redox is inspired by previous kernels and operating systems, such as SeL4, Minix, Plan 9, and BSD.
-Redox _is not_ just a kernel, it's a full-featured Operating System, providing packages (memory allocator, file system, display manager, core utilities, etc.) that together makes up a functional and convenient operating system. You can loosly think of it as the GNU or BSD ecosystem, but in a memory safe language and with modern technology. See [this list](#ecosystem) for overview of the ecosystem.
+Redox _is not_ just a kernel, it's a full-featured Operating System, providing packages (memory allocator, file system, display manager, core utilities, etc.) that together make up a functional and convenient operating system. You can loosely think of it as the GNU or BSD ecosystem, but in a memory safe language and with modern technology. See [this list](#ecosystem) for overview of the ecosystem.
The website can be found at https://www.redox-os.org.
@@ -146,7 +146,11 @@ $ make all
# Launch using QEMU
$ make qemu
+
# Launch using QEMU without using KVM (Kernel Virtual Machine). Try if QEMU gives an error.
$ make qemu kvm=no
+
+# Launch using QEMU without using KVM (Kernel Virtual Machine) nor Graphics
+make qemu kvm=no vga=no
```