Merge lp:~pwlars/lava-project/install-docs into lp:lava-project/staging

[Paul Larson]

Some documentation improvements

[Spring Zhang (qzhang)]

nice guide

review: Approve

=== modified file 'doc/index.rst'
--- doc/index.rst	2012-02-10 22:19:05 +0000
+++ doc/index.rst	2012-02-13 04:53:18 +0000
@@ -2,20 +2,20 @@
 LAVA (Linaro Automated Validation Architecture)
 ===============================================
 
-.. warning::
-    This document is *work in progress*.
-
 Features
 ========
-
-.. todo::
-    Document key LAVA features. This list should be stable and high-level so
-    that additional features added to subsequent LAVA releases don't require us
-    to rewrite this section all the time. We shold link to our sub-projects.
-
+LAVA is an automated testing framework developed by Linaro.  It includes
+a web framework with extensions for things like scheduling jobs, and
+storing results.  The web framework can be extended with custom
+extensions for storing new types of data, or presenting custom result
+views.  LAVA also has a dispatcher component for processing test jobs
+that can deploy Ubuntu based, as well as Android based Linaro images on
+supported development boards.  As with the web interface, custom
+extensions can be written to support additional client types, or
+operations to perform.  LAVA also has test runners that can provide a
+consistent interface to various Linux and Android test suites.
+Additional test suites can easily be added.
  
- .. seealso:: See what's new in :ref:`version_2011.10`
-
 LAVA Components
 ===============
 
@@ -24,7 +24,9 @@
       provides the main web interface to LAVA and supports extensions.
     `LAVA Dashboard <http://lava-dashboard.readthedocs.org/>`_
       The LAVA Dashboard is an extension to LAVA Server that handles
-      results storage and retrieval.
+      results storage and retrieval.  Results for the LAVA Dashboard are 
+      submitted using a well-defined JSON bundle format.  The schema, and 
+      example bundles are documented in the `LAVA Dashboard bundle format <http://linaro-dashboard-bundle.readthedocs.org/en/latest/index.html>`_.
     `LAVA Scheduler <http://lava-scheduler.readthedocs.org/>`_
       The LAVA Scheduler component provides a web extension for
       scheduling jobs and managing test resources, as well as a daemon
@@ -40,15 +42,15 @@
       that can be consumed by the LAVA Dashboard.
 
 
-Indices and tables
-==================
+Getting Started
+===============
 
 .. toctree::
     :maxdepth: 2
     
     installation.rst
+    lava-image-creation.rst
     process.rst
-    lava-image-creation.rst
     changes.rst
 
 * :ref:`search`

=== modified file 'doc/installation.rst'
--- doc/installation.rst	2011-10-24 17:22:06 +0000
+++ doc/installation.rst	2012-02-13 04:53:18 +0000
@@ -1,58 +1,246 @@
-Installation
-^^^^^^^^^^^^
-
-LAVA can be installed in several different ways. As with any open source
-project that does source distribution the end user has all the freedom to do
-what they want. We support certain installation methods more than others. You
-can always ask for support using Launchpad support tracker (see
-:ref:`questions`)
-
-Installation from source
-************************
-
-This is the most complicated and error prone installation method. It requires
-the user to download source release tarballs. Unpack them and install them in
-the correct order. Depending on the exact set of components that are installed
-(especially client or server side components) some additional steps are
-necessary. This may include setting up the web application host (one of many
-possible configurations here), setting up the database (again multiple possible
-options, our recommendation is to use the latest stable version of PostgreSQL).
-
-Detailed installation instructions *should* be included with each component
-documentation (do file bugs on missing documentation).
-
-
-Installation from PypI
-**********************
-
-PyPi is the python package index (http://pypi.python.org/pypi). It is
-maintained by the python community and is the preferred distribution method
-used by many open source projects written in the python programming language.
-
-Here a front-end program, such as pip (http://pypi.python.org/pypi/pip) is used
-to install packages, and their python dependencies. Pip finds the required set
-of packages, downloads their source releases and does the hard work of figuring
-out the right way to put them together.
-
-This is the best compromise between wide system support (any flavour of Linux,
-OS X and Windows), simplicity, upgrade and availability. The downside is that
-it does not handle, by itself, the last mile. This method does not handle
-things like setting up and running the application server. It also requires the
-user to have additional development packages, such as python header files,
-database server header files, the C compiler and more.
-
-
-.. todo::
-    Document virtualenv usage (recommended)
-
-
-Installation from PPA
-*********************
-
-This method is only suitable for users running Ubuntu 10.04 or later. Here LAVA
-is pre-compiled and packaged as Debian packages (debs). The installation
-scripts embedded in the packages take care for setting up additional services
-so usually this is the best method to quickly have a self-contained running
-installation. The downside is longer release period as packaging takes
-additional time after each release. Another downside is that our support is
-limited to Ubuntu.
+LAVA Deployment Tool
+====================
+
+Installing LAVA Server Components
++++++++++++++++++++++++++++++++++
+
+LAVA Deployment Tool is meant to assist you setting up LAVA on your machine.
+The tool is suitable for both personal and more "production" installations that
+are expected to perform adequately with more concurrent users. This tool is
+not, however, designed for multi-machine installation, including cloud
+deployment. For that it is likely we will turn to Juju
+(https://juju.ubuntu.com/)
+
+Quickstart
+^^^^^^^^^^
+
+For the impatient, or those just looking for a cheat sheet but know what they
+are doing otherwise, here are the basic set of commands to get an instance
+up and running based on the requirements-mini file provided as an example, 
+which only installs lava-server.
+
+::
+
+ $ ./lava-deployment-tool setup
+ $ ./lava-deployment-tool bundle requirements-mini.txt
+ $ ./lava-deployment-tool install testinstance lava.pybundle
+ $ sudo start lava-instance LAVA_INSTANCE=testinstance
+
+Assuming everything went well, you should be able to point a web browser
+at the system you did this on and see the lava-server default page.
+
+
+Software Requirements
+^^^^^^^^^^^^^^^^^^^^^
+
+This tool should work on Ubuntu versions starting with 10.10 release
+(Maverick). If you'd like to help us with other distributions feel free to
+contact us at validation (at) linaro (dot) org.
+
+Hardware Requirements
+^^^^^^^^^^^^^^^^^^^^^
+
+A small LAVA instance can be deployed on any modest hardware. We recommend at
+least one 1GB of RAM for runtime activity (this is shared, on a single host,
+among the database server, the application server and the web server). For
+storage please reserve about 20GB for application data, especially if you wish
+to mirror current public LAVA instance used by Linaro. LAVA uses append-only
+models so the storage requirements will grow at about several GB a year.
+
+Before installing
+^^^^^^^^^^^^^^^^^
+
+Before you can create your first LAVA instance (standalone, independent LAVA
+installation) you must install some shared infrastructure on your machine.
+Currently this is the Apache 2 web server, PostgreSQL database server, RabbitMQ
+messaging server, and Python (and a few python programs and libraries). Because
+this installation method is not using pre-built packages you will also need
+development headers and a working compiler to build some of the native (C)
+extensions for python.
+
+This step is largely automated. To perform it run this command:
+
+::
+
+  $ ./lava-deployment-tool setup
+
+This step also prepares file-system places for LAVA. In particular it creates
+/srv/lava/ where all LAVA instances are later stored.
+
+Creating LAVA instance
+^^^^^^^^^^^^^^^^^^^^^^
+
+You can create multiple LAVA instances on a single machine. Being able to do
+so is very valuable for testing and developing LAVA itself. Before installing
+you must first create a bundle of sources you wish to install.  This simply 
+downloads all the things you intend to install into a single, local archive
+so that installation or updating is not impacted by any problems getting the
+sources later.  This also enables offline installs, or installs behind a
+restrictive firewall by allowing you to download the bundle in advance.
+To create the bundle, run:
+
+::
+
+  $ ./lava-deployment-tool URL_to_requirements [bundle_file_name]
+
+If you do not specify the bundle_file_name, it will use the name 'lava.pybundle'
+
+To create a new instance run this command:
+
+::
+
+  $ ./lava-deployment-tool install NAME BUNDLE
+
+This will create a fresh instance called NAME, the instance will be composed of
+the software specified in the requirements file that was used to build the
+bundle and associated dependencies.
+
+The script produces verbose output, at the end it should say that everything
+went fine.
+
+Maintaining a LAVA System
++++++++++++++++++++++++++
+
+Backing Up LAVA instance
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+LAVA instances store persistent data in two locations:
+
+ * On the filesystem, in the directory
+   /srv/lava/$LAVA_INSTANCE/var/lib/lava-server/media
+ * In a PostgreSQL database in the default cluster named $LAVA_INSTANCE
+
+Backing up those two items is sufficient to preserve the entire system
+state.  You can do this by running:
+
+::
+
+  $ lava-deployment-tool backup $LAVA_INSTANCE
+
+which will create a backup with an ID based on the current date and
+time in a directory named
+"/srv/lava/backups/$LAVA_INSTANCE/$SNAPSHOT_ID/".  You can make
+/srv/lava/backups a symlink to a more appropriate location if you
+want.
+
+Generally before backing up you should make sure that LAVA instance is
+turned off. This depends on how your instance is started. If you were
+using upstart the following shell command should turn LAVA off:
+
+::
+
+  $ sudo service lava stop
+
+If you take a backup while running, you will need to do some manual
+cleanup when you restore from it.
+
+Restoring from backup
+^^^^^^^^^^^^^^^^^^^^^
+
+Running the command:
+
+::
+
+  $ lava-deployment-tool restore $LAVA_INSTANCE $SNAPSHOT_ID
+
+will restore the given snapshot of the named instance.  This will
+first erase the database and media files of the named instance, so be
+careful what you type!
+
+You can restore an instance from a backup taken from a distinct
+instance with a command like:
+
+::
+
+  $ lava-deployment-tool restore $TARGET_INSTANCE $SOURCE_INSTANCE/$SNAPSHOT_ID
+
+Currently to restore from a backup taken on a different machine, you
+have to put it under /srv/lava/backups, then run an appropriate
+"lava-deployment-tool restore" command (we will hopefully make this
+more natural soon).
+
+You cannot restore to an instance while it is running.
+
+Updating LAVA instance
+^^^^^^^^^^^^^^^^^^^^^^
+
+LAVA is released periodically. Currently this is once a month but the release
+cycle becomes more and more fluid and eventually we'd like to release multiple
+tiny changes every day.
+
+Once you installed some LAVA components you can upgrade your installation to a
+more recent release using this deployment tool. There are some important
+upgrade considerations:
+
+1) Upgrades may alter the database or persistent media files. It is wise to
+perform a full system backup before each upgrade. While we don't anticipate
+catastrophic failures it's better to be safe than sorry. Refer to the previous
+chapter for details.
+
+2) Some database schema changes take a lot of time to finish. We try to
+minimize such changes but as you can install any third-party LAVA extensions we
+cannot predict the overall downtime in such case. For official Linaro releases
+please refer to our monthly release notes that are available at
+http://lava.readthedocs.org/
+
+3) Upgrades may introduce additional dependencies, which will be installed
+automatically. Periodically we make use of additional third party open source
+libraries. Those libraries will be installed for a single LAVA instance
+_only_. Your system libraries are not affected by this step. 
+
+4) Upgrades require network access. If you are behind a firewall or a
+corporate http proxy you may experience failures. Please note that the
+upgrade process does not install components without first downloading all of
+the required pieces so in case of a network failure your current installation
+should not be affected. While typically only HTTP and HTTPS protocols are
+being used at times you may see attempts to connect to native protocols used
+by git, bazaar or mercurial.
+
+5) Upgrading process rebuilds the collection of static assets served by
+Apache. During that moment you may encounter a very brief failure to resolve
+some of the static assets (typically images, cascading style sheets and
+javascript libraries)
+
+Prior to upgrading and instance, you will need to build a new bundle based
+on your new requirements file:
+
+::
+
+  $ ./lava-deployment-tool bundle URL-to-requirements [bundle_file_name]
+
+To upgrade an existing instance run the following command:
+
+::
+
+  $ ./lava-deployment-tool upgrade NAME BUNDLE
+
+Again the NAME and URL-to-requirements have the same meaning as in the
+install command mentioned in preceding chapter.
+
+Anatomy of a LAVA instance
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+An instance is composed of several parts:
+
+ - A new system user account called $LAVA_INSTANCE
+ - A directory tree similar to standard unix filesystem rooted
+   in $LAVA_PREFIX/$LAVA_INSTANCE/
+ - A postgres user and database in the default cluster, both named
+   $LAVA_INSTANCE
+
+A note on Postgres versions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+lava-deployment-tool creates its databases in the default postgres
+cluster (on Ubuntu this is the 'main' cluster of whichever version of
+postgres was installed first).  Using a different version/cluster and
+moving between versions is not technically difficult but not currently
+supported.
+
+Contact and bug reports
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Please report bugs using
+https://bugs.launchpad.net/lava-deployment-tool/+filebug
+
+Feel free to contact us at validation (at) linaro (dot) org.

=== modified file 'doc/lava-image-creation.rst'
--- doc/lava-image-creation.rst	2012-02-10 22:26:54 +0000
+++ doc/lava-image-creation.rst	2012-02-13 04:53:18 +0000
@@ -27,17 +27,17 @@
 
 ::
 
-	127.0.1.1	linaro-developer
-	to:
-	127.1.1.1	master
+    127.0.1.1	linaro-developer
+    to:
+    127.1.1.1	master
 
 then edit /etc/hostname and change:
 
 ::
 
-	linaro-developer
-	to:
-	master
+    linaro-developer
+    to:
+    master
 
 Also, edit /etc/network/interfaces to ensure that either eth0 or usb0
 (depending on the ethernet interface on the board) is enabled. Depending on
@@ -61,7 +61,9 @@
 
 at the command prompt type:
 
-fdisk -S 63 -H 255 -c /dev/mmcblk0
+::
+
+    fdisk -S 63 -H 255 -c /dev/mmcblk0
 
 First a note. If you get anything wrong in this procedure don't panic. You can
 quit fdisk (command "q") and no changes will be saved until you explicitly tell
@@ -73,8 +75,8 @@
 
 ::
 
-	/dev/mmcblk0p1   *          63      106494       53216    c  W95 FAT32 (LBA)
-	/dev/mmcblk0p2          106496     6291455     3092480   83  Linux
+    /dev/mmcblk0p1   *          63      106494       53216    c  W95 FAT32 (LBA)
+    /dev/mmcblk0p2          106496     6291455     3092480   83  Linux
 
 If it looks like this, then follow the 2 partition instructions below.
 
@@ -82,9 +84,9 @@
 
 ::
 
-	/dev/mmcblk0p1               1        8191        4095+  da  Non-FS data
-	/dev/mmcblk0p2   *        8192      114687       53248    c  W95 FAT32 (LBA)
-	/dev/mmcblk0p3          114688     6291455     3088384   83  Linux
+    /dev/mmcblk0p1               1        8191        4095+  da  Non-FS data
+    /dev/mmcblk0p2   *        8192      114687       53248    c  W95 FAT32 (LBA)
+    /dev/mmcblk0p3          114688     6291455     3088384   83  Linux
 
 If it looks like this, follow the 3 partition instructions below:
 
@@ -106,9 +108,9 @@
 
 ::
 
-	/dev/mmcblk0p1   *          63      106494       53216    c  W95 FAT32 (LBA)
-	/dev/mmcblk0p2          106496     6291455     3092480   83  Linux
-	/dev/mmcblk0p3         6291456     6422527       65536    c  W95 FAT32 (LBA)
+    /dev/mmcblk0p1   *          63      106494       53216    c  W95 FAT32 (LBA)
+    /dev/mmcblk0p2          106496     6291455     3092480   83  Linux
+    /dev/mmcblk0p3         6291456     6422527       65536    c  W95 FAT32 (LBA)
 
 Next we need to create the testrootfs and sdcard partitions. Unfortunately
 we are only normally allowed 4 partitions so we have to create what's called
@@ -136,12 +138,12 @@
 
 ::
 
-	/dev/mmcblk0p1   *          63      106494       53216    c  W95 FAT32 (LBA)
-	/dev/mmcblk0p2          106496     6291455     3092480   83  Linux
-	/dev/mmcblk0p3         6291456     6422527       65536    c  W95 FAT32 (LBA)
-	/dev/mmcblk0p4         6422528    31116287    12346880    5  Extended
-	/dev/mmcblk0p5         6424576    23201791     8388608   83  Linux
-	/dev/mmcblk0p6        23203840    31116287     3956224    c  W95 FAT32 (LBA)
+    /dev/mmcblk0p1   *          63      106494       53216    c  W95 FAT32 (LBA)
+    /dev/mmcblk0p2          106496     6291455     3092480   83  Linux
+    /dev/mmcblk0p3         6291456     6422527       65536    c  W95 FAT32 (LBA)
+    /dev/mmcblk0p4         6422528    31116287    12346880    5  Extended
+    /dev/mmcblk0p5         6424576    23201791     8388608   83  Linux
+    /dev/mmcblk0p6        23203840    31116287     3956224    c  W95 FAT32 (LBA)
 
 Now we need to write this partition table back. Enter "w" and you will receive
 some warnings but you can ignore these.
@@ -151,44 +153,48 @@
 
 At the command prompt, type:
 
-ls -l /dev/mmcblk0*
+::
+
+    ls -l /dev/mmcblk0*
 
 and you should see something like this:
 
 ::
 
-	brw-rw---- 1 root disk 179, 0 2012-01-19 12:37 /dev/mmcblk0
-	brw-rw---- 1 root disk 179, 1 2012-01-19 12:37 /dev/mmcblk0p1
-	brw-rw---- 1 root disk 179, 2 2012-01-19 12:37 /dev/mmcblk0p2
-	brw-rw---- 1 root disk 179, 3 2012-01-19 12:37 /dev/mmcblk0p3
-	brw-rw---- 1 root disk 179, 4 2012-01-19 12:37 /dev/mmcblk0p4
-	brw-rw---- 1 root disk 179, 5 2012-01-19 12:37 /dev/mmcblk0p5
-	brw-rw---- 1 root disk 179, 6 2012-01-19 12:37 /dev/mmcblk0p6
+    brw-rw---- 1 root disk 179, 0 2012-01-19 12:37 /dev/mmcblk0
+    brw-rw---- 1 root disk 179, 1 2012-01-19 12:37 /dev/mmcblk0p1
+    brw-rw---- 1 root disk 179, 2 2012-01-19 12:37 /dev/mmcblk0p2
+    brw-rw---- 1 root disk 179, 3 2012-01-19 12:37 /dev/mmcblk0p3
+    brw-rw---- 1 root disk 179, 4 2012-01-19 12:37 /dev/mmcblk0p4
+    brw-rw---- 1 root disk 179, 5 2012-01-19 12:37 /dev/mmcblk0p5
+    brw-rw---- 1 root disk 179, 6 2012-01-19 12:37 /dev/mmcblk0p6
 
 Now we're going to make filing systems and label the new patitions. Enter the
 following three lines at the command prompt:
 
 ::
 
-	mkfs.vfat -n testboot /dev/mmcblk0p3
-	mkfs.vfat -n sdcard /dev/mmcblk0p6
-	mkfs.ext3 -L testrootfs /dev/mmcblk0p5
+    mkfs.vfat -n testboot /dev/mmcblk0p3
+    mkfs.vfat -n sdcard /dev/mmcblk0p6
+    mkfs.ext3 -L testrootfs /dev/mmcblk0p5
 
 This last command does take some time, so be patient. Once it has completed,
 reboot the card once more, and then check that the labels are correctly assigned
 by typing:
 
-ls -l /dev/disk/by-label
+::
+
+    $ ls -l /dev/disk/by-label
 
 If all is well, you should see something like the following:
 
 ::
 
-	lrwxrwxrwx 1 root root 15 May 31 21:48 boot -> ../../mmcblk0p1
-	lrwxrwxrwx 1 root root 15 May 31 21:48 rootfs -> ../../mmcblk0p2
-	lrwxrwxrwx 1 root root 15 May 31 21:48 sdcard -> ../../mmcblk0p6
-	lrwxrwxrwx 1 root root 15 May 31 21:48 testboot -> ../../mmcblk0p3
-	lrwxrwxrwx 1 root root 15 May 31 21:48 testrootfs -> ../../mmcblk0p5
+    lrwxrwxrwx 1 root root 15 May 31 21:48 boot -> ../../mmcblk0p1
+    lrwxrwxrwx 1 root root 15 May 31 21:48 rootfs -> ../../mmcblk0p2
+    lrwxrwxrwx 1 root root 15 May 31 21:48 sdcard -> ../../mmcblk0p6
+    lrwxrwxrwx 1 root root 15 May 31 21:48 testboot -> ../../mmcblk0p3
+    lrwxrwxrwx 1 root root 15 May 31 21:48 testrootfs -> ../../mmcblk0p5
 
 Your sd card image is now complete. Now, go on to the section "Adding a device
 to LAVA"
@@ -214,11 +220,11 @@
 
 ::
 
-	/dev/mmcblk0p1               1        8191        4095+  da  Non-FS data
-	/dev/mmcblk0p2   *        8192      114687       53248    c  W95 FAT32 (LBA)
-	/dev/mmcblk0p3          114688     6291455     3088384   83  Linux
-	/dev/mmcblk0p4         6291456    31116287    12412416    5  Extended
-	/dev/mmcblk0p5         6293504     6424575       65536    c  W95 FAT32 (LBA)
+    /dev/mmcblk0p1               1        8191        4095+  da  Non-FS data
+    /dev/mmcblk0p2   *        8192      114687       53248    c  W95 FAT32 (LBA)
+    /dev/mmcblk0p3          114688     6291455     3088384   83  Linux
+    /dev/mmcblk0p4         6291456    31116287    12412416    5  Extended
+    /dev/mmcblk0p5         6293504     6424575       65536    c  W95 FAT32 (LBA)
 
 To create the testrootfs partition, we type "n" to create a new partition and
 once again select the default start sector by pressing "Enter". For the last
@@ -234,13 +240,13 @@
 
 ::
 
-	/dev/mmcblk0p1               1        8191        4095+  da  Non-FS data
-	/dev/mmcblk0p2   *        8192      114687       53248    c  W95 FAT32 (LBA)
-	/dev/mmcblk0p3          114688     6291455     3088384   83  Linux
-	/dev/mmcblk0p4         6291456    31116287    12412416    5  Extended
-	/dev/mmcblk0p5         6293504     6424575       65536    c  W95 FAT32 (LBA)
-	/dev/mmcblk0p6         6426624    23203839     8388608   83  Linux
-	/dev/mmcblk0p7        23205888    31116287     3955200    c  W95 FAT32 (LBA)
+    /dev/mmcblk0p1               1        8191        4095+  da  Non-FS data
+    /dev/mmcblk0p2   *        8192      114687       53248    c  W95 FAT32 (LBA)
+    /dev/mmcblk0p3          114688     6291455     3088384   83  Linux
+    /dev/mmcblk0p4         6291456    31116287    12412416    5  Extended
+    /dev/mmcblk0p5         6293504     6424575       65536    c  W95 FAT32 (LBA)
+    /dev/mmcblk0p6         6426624    23203839     8388608   83  Linux
+    /dev/mmcblk0p7        23205888    31116287     3955200    c  W95 FAT32 (LBA)
 
 Now we need to write this partition table back. Enter "w" and you will receive
 some warnings but you can ignore these.
@@ -250,29 +256,31 @@
 
 At the command prompt, type:
 
-ls -l /dev/mmcblk0*
+::
+
+    ls -l /dev/mmcblk0*
 
 and you should see something like this:
 
 ::
 
-	brw-rw---- 1 root disk 179, 0 2012-02-10 19:30 /dev/mmcblk0
-	brw-rw---- 1 root disk 179, 1 2012-02-10 19:30 /dev/mmcblk0p1
-	brw-rw---- 1 root disk 179, 2 2012-02-10 19:30 /dev/mmcblk0p2
-	brw-rw---- 1 root disk 179, 3 2012-02-10 19:30 /dev/mmcblk0p3
-	brw-rw---- 1 root disk 179, 4 2012-02-10 19:30 /dev/mmcblk0p4
-	brw-rw---- 1 root disk 179, 5 2012-02-10 19:30 /dev/mmcblk0p5
-	brw-rw---- 1 root disk 179, 6 2012-02-10 19:30 /dev/mmcblk0p6
-	brw-rw---- 1 root disk 179, 7 2012-02-10 19:30 /dev/mmcblk0p7
+    brw-rw---- 1 root disk 179, 0 2012-02-10 19:30 /dev/mmcblk0
+    brw-rw---- 1 root disk 179, 1 2012-02-10 19:30 /dev/mmcblk0p1
+    brw-rw---- 1 root disk 179, 2 2012-02-10 19:30 /dev/mmcblk0p2
+    brw-rw---- 1 root disk 179, 3 2012-02-10 19:30 /dev/mmcblk0p3
+    brw-rw---- 1 root disk 179, 4 2012-02-10 19:30 /dev/mmcblk0p4
+    brw-rw---- 1 root disk 179, 5 2012-02-10 19:30 /dev/mmcblk0p5
+    brw-rw---- 1 root disk 179, 6 2012-02-10 19:30 /dev/mmcblk0p6
+    brw-rw---- 1 root disk 179, 7 2012-02-10 19:30 /dev/mmcblk0p7
 
 Now we're going to make filing systems and label the new patitions. Enter the
 following three lines at the command prompt:
 
 ::
 
-	mkfs.vfat -n testboot /dev/mmcblk0p5
-	mkfs.vfat -n sdcard /dev/mmcblk0p7
-	mkfs.ext3 -L testrootfs /dev/mmcblk0p6
+    mkfs.vfat -n testboot /dev/mmcblk0p5
+    mkfs.vfat -n sdcard /dev/mmcblk0p7
+    mkfs.ext3 -L testrootfs /dev/mmcblk0p6
 
 This last command does take some time, so be patient. Once it has completed,
 reboot the card once more, and then check that the labels are correctly assigned
@@ -284,11 +292,11 @@
 
 ::
 
-	lrwxrwxrwx 1 root root 15 2012-02-10 19:30 boot -> ../../mmcblk0p2
-	lrwxrwxrwx 1 root root 15 2012-02-10 19:30 rootfs -> ../../mmcblk0p3
-	lrwxrwxrwx 1 root root 15 2012-02-10 19:30 sdcard -> ../../mmcblk0p7
-	lrwxrwxrwx 1 root root 15 2012-02-10 19:30 testboot -> ../../mmcblk0p5
-	lrwxrwxrwx 1 root root 15 2012-02-10 19:30 testrootfs -> ../../mmcblk0p6
+    lrwxrwxrwx 1 root root 15 2012-02-10 19:30 boot -> ../../mmcblk0p2
+    lrwxrwxrwx 1 root root 15 2012-02-10 19:30 rootfs -> ../../mmcblk0p3
+    lrwxrwxrwx 1 root root 15 2012-02-10 19:30 sdcard -> ../../mmcblk0p7
+    lrwxrwxrwx 1 root root 15 2012-02-10 19:30 testboot -> ../../mmcblk0p5
+    lrwxrwxrwx 1 root root 15 2012-02-10 19:30 testrootfs -> ../../mmcblk0p6
 
 Your sd card image is now complete. Now, go on to the section "Adding a device
 to LAVA"
@@ -306,21 +314,21 @@
 
 ::
 
-	device_type = panda
-	hostname = panda01
+    device_type = panda
+    hostname = panda01
 
 The (current) list of supported device types is:
 
 ::
 
-	beagle
-	beagle-xm
-	mx51evk
-	mx53loco
-	origen
-	panda
-	snowball_sd
-	vexpress-a9
+    beagle
+    beagle-xm
+    mx51evk
+    mx53loco
+    origen
+    panda
+    snowball
+    vexpress-a9
 
 If your device isn't in this list check the
 /srv/lava/instances/production/etc/lava-dispatcher/device-types directory to