Merge devel in to master

.gitignore

@@ -1,2 +1,7 @@
 src/config.local
 src/image/*.zip
+src/custompios_path
+src/build.log
+src/vagrant/.vagrant/*
+src/vagrant/*.log
+src/workspace/*

README.rst

@@ -13,9 +13,9 @@ FullPageOS is a fork of `OctoPi <https://github.com/guysoft/OctoPi>`_
 Where to get it?
 ----------------
 
-Official mirror is `here <http://docstech.net/FullPageOS/>`_
+Official mirror is `here <http://unofficialpi.org/Distros/FullPageOS/>`_
 
-Nightly builds are available `here <http://docstech.net/FullPageOS/nightly/>`_ (currently built on demand)
+Nightly builds are available `here <http://unofficialpi.org/Distros/FullPageOS/nightly/>`_ (currently built on demand)
 
 How to use it?
 --------------
@@ -46,6 +46,7 @@ Requirements
 ~~~~~~~~~~~~
 
 #. `qemu-arm-static <http://packages.debian.org/sid/qemu-user-static>`_
+#. `CustomPiOS <https://github.com/guysoft/CustomPiOS>`_
 #. Downloaded `Raspbian <http://www.raspbian.org/>`_ image.
 #. root privileges for chroot
 #. Bash
@@ -59,14 +60,16 @@ FullPageOS can be built from Debian, Ubuntu, Raspbian, or even FullPageOS.
 Build requires about 2.5 GB of free space available.
 You can build it by issuing the following commands::
 
-    sudo apt-get install realpath qemu-user-static
+    sudo apt-get install realpath p7zip-full qemu-user-static
     
+    git clone https://github.com/guysoft/CustomPiOS.git
     git clone https://github.com/guysoft/FullPageOS.git
     cd FullPageOS/src/image
-    curl -J -O -L  http://downloads.raspberrypi.org/raspbian_latest
+    wget -c --trust-server-names 'https://downloads.raspberrypi.org/raspbian_lite_latest'
     cd ..
+    ../../CustomPiOS/src/update-custompios-paths
     sudo modprobe loop
-    sudo bash -x ./build
+    sudo bash -x ./build_dist
     
 Building FullPageOS Variants
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -75,15 +78,19 @@ FullPageOS supports building variants, which are builds with changes from the ma
 
 To build a variant use::
 
-    sudo bash -x ./build [Variant]
+    sudo bash -x ./build_dist [Variant]
     
 Building Using Vagrant
 ~~~~~~~~~~~~~~~~~~~~~~
 There is a vagrant machine configuration to let build FullPageOS in case your build environment behaves differently. Unless you do extra configuration, vagrant must run as root to have nfs folder sync working.
 
+Make sure you have a version of vagrant later than 1.9!
+
+If you are using older versions of Ubuntu/Debian and not using apt-get `from the download page <https://www.vagrantup.com/downloads.html>`_.
+
 To use it::
 
-    sudo apt-get install vagrant nfs-kernel-server
+    sudo apt-get install vagrant nfs-kernel-server virtualbox
     sudo vagrant plugin install vagrant-nfs_guest
     sudo modprobe nfs
     cd FullPageOS/src/vagrant
@@ -103,7 +110,7 @@ Usage
 ~~~~~
 
 #. If needed, override existing config settings by creating a new file ``src/config.local``. You can override all settings found in ``src/config``. If you need to override the path to the Raspbian image to use for building OctoPi, override the path to be used in ``ZIP_IMG``. By default, the most recent file matching ``*-raspbian.zip`` found in ``src/image`` will be used.
-#. Run ``src/build`` as root.
+#. Run ``src/build_dist`` as root.
 #. The final image will be created in ``src/workspace``
 
 Code contribution would be appreciated!

src/build_dist

@@ -0,0 +1,9 @@
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+export DIST_PATH=${DIR}
+export CUSTOM_PI_OS_PATH=$(<${DIR}/custompios_path)
+export PATH=$PATH:$CUSTOM_PI_OS_PATH
+echo ${CUSTOM_PI_OS_PATH}
+
+${CUSTOM_PI_OS_PATH}/build_custom_os $@
+