From 279ac23d8369e709b2b5bcd27d42a28f004aa575 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 16 May 2015 15:02:47 +0200
Subject: [PATCH] docs: user/x86
Fixes #373
---
docs/index.rst | 5 +++++
docs/user/x86.rst | 29 +++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
create mode 100644 docs/user/x86.rst
diff --git a/docs/index.rst b/docs/index.rst
index 5fc679a0f..92fb58b7f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,6 +13,7 @@ User Documentation
user/getting_started
user/site
+ user/x86
user/faq
Features
@@ -152,10 +153,14 @@ x86-generic
* x86-virtualbox
* x86-vmware
+See also: :doc:`user/x86`
+
x86-kvm_guest
^^^^^^^^^^^^^
* x86-kvm
+See also: :doc:`user/x86`
+
License
-------
diff --git a/docs/user/x86.rst b/docs/user/x86.rst
new file mode 100644
index 000000000..b985d6fc1
--- /dev/null
+++ b/docs/user/x86.rst
@@ -0,0 +1,29 @@
+x86 support
+===========
+
+Gluon can run on normal x86 systems, for example virtual machines
+and VPN boxes. There is no WLAN support on x86 though.
+
+Targets
+^^^^^^^
+
+There are two targets for x86 images:
+
+`x86-generic`
+ Generic x86 support with many different ethernet drivers; should run on
+ most x86 systems.
+
+ There are three images:
+
+ * `generic` (compressed "raw" image, can written to a disk directly or booted with qemu)
+ * `virtualbox` (VDI image)
+ * `vmware` (VMDK image)
+
+ These images only differ in the image file format, the content is the same. Therefore there is
+ only a single `x86-generic` sysupgrade image instead of three.
+
+ Please note that the `x86-generic` image doesn't include VirtIO support, so another virtual NIC
+ like `pcnet32` must be chosen when using VirtualBox.
+
+`x86-kvm`
+ The `x86-kvm` image uses VirtIO as its harddisk and network driver.
--
GitLab