From 50f41db04320477cfff7e26159164c07a9a76e9b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 5 Nov 2016 16:58:14 +0000
Subject: [PATCH] Update install instructions

---
 doc/EN/homeserver.org      | 26 ++++++++++++++++++--------
 website/EN/homeserver.html | 33 ++++++++++++++++++++++++---------
 2 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/doc/EN/homeserver.org b/doc/EN/homeserver.org
index f511100a..534e4207 100644
--- a/doc/EN/homeserver.org
+++ b/doc/EN/homeserver.org
@@ -17,20 +17,30 @@
 
 The quickest way to get started is as follows. You will need to be running a Debian based system (version 8 or later), have an old but still working laptop or netbook which you can use as a server, and 8GB or larger USB thumb drive and an ethernet cable to connect the laptop to your internet router.
 
-First you will need to create an image.
+First you will need to create an image. On a debian based distro:
 
 #+begin_src bash
-sudo su
-apt-get -y install build-essential libc6-dev-i386 \
-gcc-multilib g++-multilib git python-docutils mktorrent \
-vmdebootstrap xz-utils dosfstools btrfs-tools extlinux \
-python-distro-info mbr qemu-user-static binfmt-support \
-u-boot-tools qemu
+sudo apt-get install git
 git clone https://github.com/bashrc/freedombone
 cd freedombone
 git checkout stockholm
 make install
-freedombone-image -t i386 -s 7.8G --onion yes
+freedombone-image --setup debian
+freedombone-image -t i386 --onion yes
+#+end_src
+
+Or on Arch/Parabola:
+
+First you will need to create an image. On a debian based distro:
+
+#+begin_src bash
+sudo pacman -S git
+git clone https://github.com/bashrc/freedombone
+cd freedombone
+git checkout stockholm
+make install
+freedombone-image --setup parabola
+freedombone-image -t i386 --onion yes
 #+end_src
 
 This takes a while. Maybe an hour or so, depending on the speed of your system and the internets. The good news though is that once created you can use the resulting image any number of times, and you don't need to trust some pre-built image.
diff --git a/website/EN/homeserver.html b/website/EN/homeserver.html
index dc88f49b..54f08210 100644
--- a/website/EN/homeserver.html
+++ b/website/EN/homeserver.html
@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2016-10-31 Mon 16:23 -->
+<!-- 2016-11-05 Sat 16:57 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
@@ -251,21 +251,36 @@ The quickest way to get started is as follows. You will need to be running a Deb
 </p>
 
 <p>
-First you will need to create an image.
+First you will need to create an image. On a debian based distro:
 </p>
 
 <div class="org-src-container">
-<pre class="src src-bash">sudo su
-apt-get -y install build-essential libc6-dev-i386 <span class="org-sh-escaped-newline">\</span>
-gcc-multilib g++-multilib git python-docutils mktorrent <span class="org-sh-escaped-newline">\</span>
-vmdebootstrap xz-utils dosfstools btrfs-tools extlinux <span class="org-sh-escaped-newline">\</span>
-python-distro-info mbr qemu-user-static binfmt-support <span class="org-sh-escaped-newline">\</span>
-u-boot-tools qemu
+<pre class="src src-bash">sudo apt-get install git
 git clone https://github.com/bashrc/freedombone
 <span class="org-builtin">cd</span> freedombone
 git checkout stockholm
 make install
-freedombone-image -t i386 -s 7.8G --onion yes
+freedombone-image --setup debian
+freedombone-image -t i386 --onion yes
+</pre>
+</div>
+
+<p>
+Or on Arch/Parabola:
+</p>
+
+<p>
+First you will need to create an image. On a debian based distro:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">sudo pacman -S git
+git clone https://github.com/bashrc/freedombone
+<span class="org-builtin">cd</span> freedombone
+git checkout stockholm
+make install
+freedombone-image --setup parabola
+freedombone-image -t i386 --onion yes
 </pre>
 </div>
 
