Initial commit

2020-08-17 17:54:31 -06:00 · 2020-08-17 17:54:31 -06:00 · a0ccff5f4d
commit a0ccff5f4d
103 changed files with 3064 additions and 0 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -0,0 +1,5 @@
+output/
+work/
+deploy/
+apt-cacher-ng/
+.git/objects/*
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,9 @@
+deploy/*
+work/*
+config
+postrun.sh
+SKIP
+SKIP_IMAGES
+.pc
+*-pc
+apt-cacher-ng/
--- a/15
+++ b/15
@ -0,0 +1,15 @@
+FROM debian:buster
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get -y update && \
+    apt-get -y install --no-install-recommends \
+        git vim parted \
+        quilt coreutils qemu-user-static debootstrap zerofree zip dosfstools \
+        bsdtar libcap2-bin rsync grep udev xz-utils curl xxd file kmod bc\
+        binfmt-support ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY . /pi-gen/
+
+VOLUME [ "/pi-gen/work", "/pi-gen/deploy"]
--- a/13
+++ b/13
@ -0,0 +1,13 @@
+Copyright (c) 2015 Raspberry Pi (Trading) Ltd.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/README-pigen.md
+++ b/README-pigen.md
@ -0,0 +1,356 @@
+# pi-gen
+
+_Tool used to create the raspberrypi.org Raspbian images_
+
+
+## Dependencies
+
+pi-gen runs on Debian based operating systems. Currently it is only supported on
+either Debian Buster or Ubuntu Xenial and is known to have issues building on
+earlier releases of these systems. On other Linux distributions it may be possible
+to use the Docker build described below.
+
+To install the required dependencies for pi-gen you should run:
+
+```bash
+apt-get install coreutils quilt parted qemu-user-static debootstrap zerofree zip \
+dosfstools bsdtar libcap2-bin grep rsync xz-utils file git curl bc
+```
+
+The file `depends` contains a list of tools needed.  The format of this
+package is `<tool>[:<debian-package>]`.
+
+
+## Config
+
+Upon execution, `build.sh` will source the file `config` in the current
+working directory.  This bash shell fragment is intended to set needed
+environment variables.
+
+The following environment variables are supported:
+
+ * `IMG_NAME` **required** (Default: unset)
+
+   The name of the image to build with the current stage directories.  Setting
+   `IMG_NAME=Raspbian` is logical for an unmodified RPi-Distro/pi-gen build,
+   but you should use something else for a customized version.  Export files
+   in stages may add suffixes to `IMG_NAME`.
+
+ * `RELEASE` (Default: buster)
+
+   The release version to build images against. Valid values are jessie, stretch
+   buster, bullseye, and testing.
+
+ * `APT_PROXY` (Default: unset)
+
+   If you require the use of an apt proxy, set it here.  This proxy setting
+   will not be included in the image, making it safe to use an `apt-cacher` or
+   similar package for development.
+
+   If you have Docker installed, you can set up a local apt caching proxy to
+   like speed up subsequent builds like this:
+
+       docker-compose up -d
+       echo 'APT_PROXY=http://172.17.0.1:3142' >> config
+
+ * `BASE_DIR`  (Default: location of `build.sh`)
+
+   **CAUTION**: Currently, changing this value will probably break build.sh
+
+   Top-level directory for `pi-gen`.  Contains stage directories, build
+   scripts, and by default both work and deployment directories.
+
+ * `WORK_DIR`  (Default: `"$BASE_DIR/work"`)
+
+   Directory in which `pi-gen` builds the target system.  This value can be
+   changed if you have a suitably large, fast storage location for stages to
+   be built and cached.  Note, `WORK_DIR` stores a complete copy of the target
+   system for each build stage, amounting to tens of gigabytes in the case of
+   Raspbian.
+
+   **CAUTION**: If your working directory is on an NTFS partition you probably won't be able to build. Make sure this is a proper Linux filesystem.
+
+ * `DEPLOY_DIR`  (Default: `"$BASE_DIR/deploy"`)
+
+   Output directory for target system images and NOOBS bundles.
+
+ * `DEPLOY_ZIP` (Default: `1`)
+
+   Setting to `0` will deploy the actual image (`.img`) instead of a zipped image (`.zip`).
+
+ * `USE_QEMU` (Default: `"0"`)
+
+   Setting to '1' enables the QEMU mode - creating an image that can be mounted via QEMU for an emulated
+   environment. These images include "-qemu" in the image file name.
+
+ * `LOCALE_DEFAULT` (Default: "en_GB.UTF-8" )
+
+   Default system locale.
+
+ * `TARGET_HOSTNAME` (Default: "raspberrypi" )
+
+   Setting the hostname to the specified value.
+
+ * `KEYBOARD_KEYMAP` (Default: "gb" )
+
+   Default keyboard keymap.
+
+   To get the current value from a running system, run `debconf-show
+   keyboard-configuration` and look at the
+   `keyboard-configuration/xkb-keymap` value.
+
+ * `KEYBOARD_LAYOUT` (Default: "English (UK)" )
+
+   Default keyboard layout.
+
+   To get the current value from a running system, run `debconf-show
+   keyboard-configuration` and look at the
+   `keyboard-configuration/variant` value.
+
+ * `TIMEZONE_DEFAULT` (Default: "Europe/London" )
+
+   Default keyboard layout.
+
+   To get the current value from a running system, look in
+   `/etc/timezone`.
+
+ * `FIRST_USER_NAME` (Default: "pi" )
+
+   Username for the first user
+
+ * `FIRST_USER_PASS` (Default: "raspberry")
+
+   Password for the first user
+
+ * `WPA_ESSID`, `WPA_PASSWORD` and `WPA_COUNTRY` (Default: unset)
+
+   If these are set, they are use to configure `wpa_supplicant.conf`, so that the Raspberry Pi can automatically connect to a wifi network on first boot. If `WPA_ESSID` is set and `WPA_PASSWORD` is unset an unprotected wifi network will be configured. If set, `WPA_PASSWORD` must be between 8 and 63 characters.
+
+ * `ENABLE_SSH` (Default: `0`)
+
+   Setting to `1` will enable ssh server for remote log in. Note that if you are using a common password such as the defaults there is a high risk of attackers taking over you Raspberry Pi.
+
+ * `STAGE_LIST` (Default: `stage*`)
+
+    If set, then instead of working through the numeric stages in order, this list will be followed. For example setting to `"stage0 stage1 mystage stage2"` will run the contents of `mystage` before stage2. Note that quotes are needed around the list. An absolute or relative path can be given for stages outside the pi-gen directory.
+
+A simple example for building Raspbian:
+
+```bash
+IMG_NAME='Raspbian'
+```
+
+The config file can also be specified on the command line as an argument the `build.sh` or `build-docker.sh` scripts.
+
+```
+./build.sh -c myconfig
+```
+
+This is parsed after `config` so can be used to override values set there.
+
+## How the build process works
+
+The following process is followed to build images:
+
+ * Loop through all of the stage directories in alphanumeric order
+
+ * Move on to the next directory if this stage directory contains a file called
+   "SKIP"
+
+ * Run the script ```prerun.sh``` which is generally just used to copy the build
+   directory between stages.
+
+ * In each stage directory loop through each subdirectory and then run each of the
+   install scripts it contains, again in alphanumeric order. These need to be named
+   with a two digit padded number at the beginning.
+   There are a number of different files and directories which can be used to
+   control different parts of the build process:
+
+     - **00-run.sh** - A unix shell script. Needs to be made executable for it to run.
+
+     - **00-run-chroot.sh** - A unix shell script which will be run in the chroot
+       of the image build directory. Needs to be made executable for it to run.
+
+     - **00-debconf** - Contents of this file are passed to debconf-set-selections
+       to configure things like locale, etc.
+
+     - **00-packages** - A list of packages to install. Can have more than one, space
+       separated, per line.
+
+     - **00-packages-nr** - As 00-packages, except these will be installed using
+       the ```--no-install-recommends -y``` parameters to apt-get.
+
+     - **00-patches** - A directory containing patch files to be applied, using quilt.
+       If a file named 'EDIT' is present in the directory, the build process will
+       be interrupted with a bash session, allowing an opportunity to create/revise
+       the patches.
+
+  * If the stage directory contains files called "EXPORT_NOOBS" or "EXPORT_IMAGE" then
+    add this stage to a list of images to generate
+
+  * Generate the images for any stages that have specified them
+
+It is recommended to examine build.sh for finer details.
+
+
+## Docker Build
+
+Docker can be used to perform the build inside a container. This partially isolates
+the build from the host system, and allows using the script on non-debian based
+systems (e.g. Fedora Linux). The isolate is not complete due to the need to use
+some kernel level services for arm emulation (binfmt) and loop devices (losetup).
+
+To build:
+
+```bash
+vi config         # Edit your config file. See above.
+./build-docker.sh
+```
+
+If everything goes well, your finished image will be in the `deploy/` folder.
+You can then remove the build container with `docker rm -v pigen_work`
+
+If something breaks along the line, you can edit the corresponding scripts, and
+continue:
+
+```bash
+CONTINUE=1 ./build-docker.sh
+```
+
+To examine the container after a failure you can enter a shell within it using:
+
+```bash
+sudo docker run -it --privileged --volumes-from=pigen_work pi-gen /bin/bash
+```
+
+After successful build, the build container is by default removed. This may be undesired when making incremental changes to a customized build. To prevent the build script from remove the container add
+
+```bash
+PRESERVE_CONTAINER=1 ./build-docker.sh
+```
+
+There is a possibility that even when running from a docker container, the
+installation of `qemu-user-static` will silently fail when building the image
+because `binfmt-support` _must be enabled on the underlying kernel_. An easy
+fix is to ensure `binfmt-support` is installed on the host machine before
+starting the `./build-docker.sh` script (or using your own docker build
+solution).
+
+
+## Stage Anatomy
+
+### Raspbian Stage Overview
+
+The build of Raspbian is divided up into several stages for logical clarity
+and modularity.  This causes some initial complexity, but it simplifies
+maintenance and allows for more easy customization.
+
+ - **Stage 0** - bootstrap.  The primary purpose of this stage is to create a
+   usable filesystem.  This is accomplished largely through the use of
+   `debootstrap`, which creates a minimal filesystem suitable for use as a
+   base.tgz on Debian systems.  This stage also configures apt settings and
+   installs `raspberrypi-bootloader` which is missed by debootstrap.  The
+   minimal core is installed but not configured, and the system will not quite
+   boot yet.
+
+ - **Stage 1** - truly minimal system.  This stage makes the system bootable by
+   installing system files like `/etc/fstab`, configures the bootloader, makes
+   the network operable, and installs packages like raspi-config.  At this
+   stage the system should boot to a local console from which you have the
+   means to perform basic tasks needed to configure and install the system.
+   This is as minimal as a system can possibly get, and its arguably not
+   really usable yet in a traditional sense yet.  Still, if you want minimal,
+   this is minimal and the rest you could reasonably do yourself as sysadmin.
+
+ - **Stage 2** - lite system.  This stage produces the Raspbian-Lite image.  It
+   installs some optimized memory functions, sets timezone and charmap
+   defaults, installs fake-hwclock and ntp, wifi and bluetooth support,
+   dphys-swapfile, and other basics for managing the hardware.  It also
+   creates necessary groups and gives the pi user access to sudo and the
+   standard console hardware permission groups.
+
+   There are a few tools that may not make a whole lot of sense here for
+   development purposes on a minimal system such as basic Python and Lua
+   packages as well as the `build-essential` package.  They are lumped right
+   in with more essential packages presently, though they need not be with
+   pi-gen.  These are understandable for Raspbian's target audience, but if
+   you were looking for something between truly minimal and Raspbian-Lite,
+   here's where you start trimming.
+
+ - **Stage 3** - desktop system.  Here's where you get the full desktop system
+   with X11 and LXDE, web browsers, git for development, Raspbian custom UI
+   enhancements, etc.  This is a base desktop system, with some development
+   tools installed.
+
+ - **Stage 4** - Normal Raspbian image. System meant to fit on a 4GB card. This is the
+   stage that installs most things that make Raspbian friendly to new
+   users like system documentation.
+
+ - **Stage 5** - The Raspbian Full image. More development
+   tools, an email client, learning tools like Scratch, specialized packages
+   like sonic-pi, office productivity, etc.  
+
+### Stage specification
+
+If you wish to build up to a specified stage (such as building up to stage 2
+for a lite system), place an empty file named `SKIP` in each of the `./stage`
+directories you wish not to include.
+
+Then add an empty file named `SKIP_IMAGES` to `./stage4` and `./stage5` (if building up to stage 2) or
+to `./stage2` (if building a minimal system).
+
+```bash
+# Example for building a lite system
+echo "IMG_NAME='Raspbian'" > config
+touch ./stage3/SKIP ./stage4/SKIP ./stage5/SKIP
+touch ./stage4/SKIP_IMAGES ./stage5/SKIP_IMAGES
+sudo ./build.sh  # or ./build-docker.sh
+```
+
+If you wish to build further configurations upon (for example) the lite
+system, you can also delete the contents of `./stage3` and `./stage4` and
+replace with your own contents in the same format.
+
+
+## Skipping stages to speed up development
+
+If you're working on a specific stage the recommended development process is as
+follows:
+
+ * Add a file called SKIP_IMAGES into the directories containing EXPORT_* files
+   (currently stage2, stage4 and stage5)
+ * Add SKIP files to the stages you don't want to build. For example, if you're
+   basing your image on the lite image you would add these to stages 3, 4 and 5.
+ * Run build.sh to build all stages
+ * Add SKIP files to the earlier successfully built stages
+ * Modify the last stage
+ * Rebuild just the last stage using ```sudo CLEAN=1 ./build.sh```
+ * Once you're happy with the image you can remove the SKIP_IMAGES files and
+   export your image to test
+
+# Troubleshooting
+
+## `64 Bit Systems`
+Please note there is currently an issue when compiling with a 64 Bit OS. See https://github.com/RPi-Distro/pi-gen/issues/271
+
+## `binfmt_misc`
+
+Linux is able execute binaries from other architectures, meaning that it should be
+possible to make use of `pi-gen` on an x86_64 system, even though it will be running
+ARM binaries. This requires support from the [`binfmt_misc`](https://en.wikipedia.org/wiki/Binfmt_misc)
+kernel module.
+
+You may see the following error:
+
+```
+update-binfmts: warning: Couldn't load the binfmt_misc module.
+```
+
+To resolve this, ensure that the following files are available (install them if necessary):
+
+```
+/lib/modules/$(uname -r)/kernel/fs/binfmt_misc.ko
+/usr/bin/qemu-arm-static
+```
+
+You may also need to load the module by hand - run `modprobe binfmt_misc`.
--- a/README.md
+++ b/README.md
@ -0,0 +1,56 @@
+# TouchPrint
+TouchPrint is a lightweight fork of Raspberry Pi OS whos purpose is to host OctoPrint and to display it on a connected screen.
+TouchPrint is very customizable, and both the GUI and/or OctoPrint can be disabled if you already have an existing setup to perform those tasks.
+
+
+## Screenshots
+TODO
+
+## Requirements
+### Minimum:
+- Raspberry Pi 3
+- 8GB microSD card
+- Keyboard and video for first time setup
+
+### Recommended:
+- Raspberry Pi 4
+- 8GB Class 10 microSD card
+- Keyboard and video for first time setup
+
+## Quick Setup Guide
+### Flashing on Windows/Mac OS/Linux (Easy)
+1. Download and install [balenaEtcher](https://www.balena.io/etcher/).
+2. Download the [latest image from the releases section](/releases).
+3. Follow the on screen instructions in Etcher to burn the image to your microSD or [USB drive](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bootmodes/msd.md).
+
+### Flashing in Mac OS/Linux/BSD (Recommended)
+1. Download the [latest image from the releases section](/releases).
+2. Open a terminal and navigate to where you downloaded the image file.
+3. Ensure that xz is installed on your computer.
+| **OS**        | **Command**            |
+|---------------|------------------------|
+| Ubuntu/Debian | `apt install xz-utils` |
+| Arch/Manjaro  | `pacman -S xz`         |
+| Mac OS        | `brew install xz`      |
+4. Run `xz -d -c IMAGE_NAME.img.xz | sudo dd of=/dev/sdX`, replacing IMAGE\_NAME and /dev/sdX with the appropriate paths, and adding flags per your preferences.
+
+### First Boot
+1. Connect an HDMI cable and a keyboard to your Raspberry Pi.
+2. Power on your Raspberry Pi and wait for it to boot.
+3. Once booted, you will be put into the first time setup, where you can configure networking, choose which services you want to run, etc.
+  - Use the arrow keys to move the "cursor", Spacebar to toggle checkboxes, Tab to move the cursor between different sections, and Enter to continue.
+4. Once the first time setup is complete, the Raspberry Pi will reboot.
+
+### OctoPrint Setup
+- If the GUI is enabled, you can setup OctoPrint on the Raspberry Pi. You can also setup OctoPrint by opening up a web browser on another computer and navigating to `https://RPI-IP`, replacing RPI-IP with the IP address of your Raspberry Pi.
+- If MJPG-Streamer is enabled, you can put `/webcam/?action=stream` into the Stream URL box to enable it in OctoPrint.
+
+### Accessing OctoPrint
+- If OctoPrint is enabled, you can access it at `https://RPI-IP`, replacing RPI-IP with the IP address of your Raspberry Pi.
+
+### Reporting Bugs
+Please report any bugs by [filing an issue](/issues). Please include as much detail as you can, including:
+- Raspberry Pi Model
+- What you were doing when the bug occured
+- Steps to reproduce
+- Logs
--- a/TODO.md
+++ b/TODO.md
@ -0,0 +1,16 @@
+# TODO:
+
+## First time/Octo-Config
+- Add network configuration (replace nmtui)
+- Add hostname configuration (replace nmtui)
+- Timezone selection
+
+## Misc
+- More security
+
+## Things to consider
+- Wayland using labwc/waybox
+- Python 3
+- Detect if frontend did not load correctly (probably not easy)
+- HTTP/Port 80 redirect
+
--- a/build-docker.sh
+++ b/build-docker.sh
@ -0,0 +1,108 @@
+#!/bin/bash -eu
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+BUILD_OPTS="$*"
+
+DOCKER="docker"
+
+if ! ${DOCKER} ps >/dev/null 2>&1; then
+	DOCKER="sudo docker"
+fi
+if ! ${DOCKER} ps >/dev/null; then
+	echo "error connecting to docker:"
+	${DOCKER} ps
+	exit 1
+fi
+
+CONFIG_FILE=""
+if [ -f "${DIR}/config" ]; then
+	CONFIG_FILE="${DIR}/config"
+fi
+
+while getopts "c:" flag
+do
+	case "${flag}" in
+		c)
+			CONFIG_FILE="${OPTARG}"
+			;;
+		*)
+			;;
+	esac
+done
+
+# Ensure that the configuration file is an absolute path
+if test -x /usr/bin/realpath; then
+	CONFIG_FILE=$(realpath -s "$CONFIG_FILE" || realpath "$CONFIG_FILE")
+fi
+
+# Ensure that the confguration file is present
+if test -z "${CONFIG_FILE}"; then
+	echo "Configuration file need to be present in '${DIR}/config' or path passed as parameter"
+	exit 1
+else
+	# shellcheck disable=SC1090
+	source ${CONFIG_FILE}
+fi
+
+CONTAINER_NAME=${CONTAINER_NAME:-pigen_work}
+CONTINUE=${CONTINUE:-0}
+PRESERVE_CONTAINER=${PRESERVE_CONTAINER:-0}
+
+if [ -z "${IMG_NAME}" ]; then
+	echo "IMG_NAME not set in 'config'" 1>&2
+	echo 1>&2
+exit 1
+fi
+
+# Ensure the Git Hash is recorded before entering the docker container
+GIT_HASH=${GIT_HASH:-"$(git rev-parse HEAD)"}
+
+CONTAINER_EXISTS=$(${DOCKER} ps -a --filter name="${CONTAINER_NAME}" -q)
+CONTAINER_RUNNING=$(${DOCKER} ps --filter name="${CONTAINER_NAME}" -q)
+if [ "${CONTAINER_RUNNING}" != "" ]; then
+	echo "The build is already running in container ${CONTAINER_NAME}. Aborting."
+	exit 1
+fi
+if [ "${CONTAINER_EXISTS}" != "" ] && [ "${CONTINUE}" != "1" ]; then
+	echo "Container ${CONTAINER_NAME} already exists and you did not specify CONTINUE=1. Aborting."
+	echo "You can delete the existing container like this:"
+	echo "  ${DOCKER} rm -v ${CONTAINER_NAME}"
+	exit 1
+fi
+
+# Modify original build-options to allow config file to be mounted in the docker container
+BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')"
+
+${DOCKER} build -t pi-gen "${DIR}"
+if [ "${CONTAINER_EXISTS}" != "" ]; then
+	trap 'echo "got CTRL+C... please wait 5s" && ${DOCKER} stop -t 5 ${CONTAINER_NAME}_cont' SIGINT SIGTERM
+	time ${DOCKER} run --rm --privileged \
+		--volume "${CONFIG_FILE}":/config:ro \
+		-e "GIT_HASH=${GIT_HASH}" \
+		--volumes-from="${CONTAINER_NAME}" --name "${CONTAINER_NAME}_cont" \
+		pi-gen \
+		bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
+	cd /pi-gen; ./build.sh ${BUILD_OPTS} &&
+	rsync -av work/*/build.log deploy/" &
+	wait "$!"
+else
+	trap 'echo "got CTRL+C... please wait 5s" && ${DOCKER} stop -t 5 ${CONTAINER_NAME}' SIGINT SIGTERM
+	time ${DOCKER} run --name "${CONTAINER_NAME}" --privileged \
+		--volume "${CONFIG_FILE}":/config:ro \
+		-e "GIT_HASH=${GIT_HASH}" \
+		pi-gen \
+		bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
+	cd /pi-gen; ./build.sh ${BUILD_OPTS} &&
+	rsync -av work/*/build.log deploy/" &
+	wait "$!"
+fi
+echo "copying results from deploy/"
+${DOCKER} cp "${CONTAINER_NAME}":/pi-gen/deploy .
+ls -lah deploy
+
+# cleanup
+if [ "${PRESERVE_CONTAINER}" != "1" ]; then
+	${DOCKER} rm -v "${CONTAINER_NAME}"
+fi
+
+echo "Done! Your image(s) should be in deploy/"
--- a/build.sh
+++ b/build.sh
@ -0,0 +1,263 @@
+#!/bin/bash -e
+# shellcheck disable=SC2119
+run_sub_stage()
+{
+	log "Begin ${SUB_STAGE_DIR}"
+	pushd "${SUB_STAGE_DIR}" > /dev/null
+	for i in {00..99}; do
+		if [ -f "${i}-debconf" ]; then
+			log "Begin ${SUB_STAGE_DIR}/${i}-debconf"
+			on_chroot << EOF
+debconf-set-selections <<SELEOF
+$(cat "${i}-debconf")
+SELEOF
+EOF
+
+		log "End ${SUB_STAGE_DIR}/${i}-debconf"
+		fi
+		if [ -f "${i}-packages-nr" ]; then
+			log "Begin ${SUB_STAGE_DIR}/${i}-packages-nr"
+			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages-nr")"
+			if [ -n "$PACKAGES" ]; then
+				on_chroot << EOF
+apt-get -o APT::Acquire::Retries=3 install --no-install-recommends -y $PACKAGES
+EOF
+			fi
+			log "End ${SUB_STAGE_DIR}/${i}-packages-nr"
+		fi
+		if [ -f "${i}-packages" ]; then
+			log "Begin ${SUB_STAGE_DIR}/${i}-packages"
+			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages")"
+			if [ -n "$PACKAGES" ]; then
+				on_chroot << EOF
+apt-get -o APT::Acquire::Retries=3 install -y $PACKAGES
+EOF
+			fi
+			log "End ${SUB_STAGE_DIR}/${i}-packages"
+		fi
+		if [ -d "${i}-patches" ]; then
+			log "Begin ${SUB_STAGE_DIR}/${i}-patches"
+			pushd "${STAGE_WORK_DIR}" > /dev/null
+			if [ "${CLEAN}" = "1" ]; then
+				rm -rf .pc
+				rm -rf ./*-pc
+			fi
+			QUILT_PATCHES="${SUB_STAGE_DIR}/${i}-patches"
+			SUB_STAGE_QUILT_PATCH_DIR="$(basename "$SUB_STAGE_DIR")-pc"
+			mkdir -p "$SUB_STAGE_QUILT_PATCH_DIR"
+			ln -snf "$SUB_STAGE_QUILT_PATCH_DIR" .pc
+			quilt upgrade
+			if [ -e "${SUB_STAGE_DIR}/${i}-patches/EDIT" ]; then
+				echo "Dropping into bash to edit patches..."
+				bash
+			fi
+			RC=0
+			quilt push -a || RC=$?
+			case "$RC" in
+				0|2)
+					;;
+				*)
+					false
+					;;
+			esac
+			popd > /dev/null
+			log "End ${SUB_STAGE_DIR}/${i}-patches"
+		fi
+		if [ -x ${i}-run.sh ]; then
+			log "Begin ${SUB_STAGE_DIR}/${i}-run.sh"
+			./${i}-run.sh
+			log "End ${SUB_STAGE_DIR}/${i}-run.sh"
+		fi
+		if [ -f ${i}-run-chroot.sh ]; then
+			log "Begin ${SUB_STAGE_DIR}/${i}-run-chroot.sh"
+			on_chroot < ${i}-run-chroot.sh
+			log "End ${SUB_STAGE_DIR}/${i}-run-chroot.sh"
+		fi
+	done
+	popd > /dev/null
+	log "End ${SUB_STAGE_DIR}"
+}
+
+
+run_stage(){
+	log "Begin ${STAGE_DIR}"
+	STAGE="$(basename "${STAGE_DIR}")"
+	pushd "${STAGE_DIR}" > /dev/null
+	unmount "${WORK_DIR}/${STAGE}"
+	STAGE_WORK_DIR="${WORK_DIR}/${STAGE}"
+	ROOTFS_DIR="${STAGE_WORK_DIR}"/rootfs
+	if [ ! -f SKIP_IMAGES ]; then
+		if [ -f "${STAGE_DIR}/EXPORT_IMAGE" ]; then
+			EXPORT_DIRS="${EXPORT_DIRS} ${STAGE_DIR}"
+		fi
+	fi
+	if [ ! -f SKIP ]; then
+		if [ "${CLEAN}" = "1" ]; then
+			if [ -d "${ROOTFS_DIR}" ]; then
+				rm -rf "${ROOTFS_DIR}"
+			fi
+		fi
+		if [ -x prerun.sh ]; then
+			log "Begin ${STAGE_DIR}/prerun.sh"
+			./prerun.sh
+			log "End ${STAGE_DIR}/prerun.sh"
+		fi
+		for SUB_STAGE_DIR in "${STAGE_DIR}"/*; do
+			if [ -d "${SUB_STAGE_DIR}" ] &&
+			   [ ! -f "${SUB_STAGE_DIR}/SKIP" ]; then
+				run_sub_stage
+			fi
+		done
+	fi
+	unmount "${WORK_DIR}/${STAGE}"
+	PREV_STAGE="${STAGE}"
+	PREV_STAGE_DIR="${STAGE_DIR}"
+	PREV_ROOTFS_DIR="${ROOTFS_DIR}"
+	popd > /dev/null
+	log "End ${STAGE_DIR}"
+}
+
+if [ "$(id -u)" != "0" ]; then
+	echo "Please run as root" 1>&2
+	exit 1
+fi
+
+BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+export BASE_DIR
+
+if [ -f config ]; then
+	# shellcheck disable=SC1091
+	source config
+fi
+
+while getopts "c:" flag
+do
+	case "$flag" in
+		c)
+			EXTRA_CONFIG="$OPTARG"
+			# shellcheck disable=SC1090
+			source "$EXTRA_CONFIG"
+			;;
+		*)
+			;;
+	esac
+done
+
+export PI_GEN=${PI_GEN:-pi-gen}
+export PI_GEN_REPO=${PI_GEN_REPO:-https://github.com/RPi-Distro/pi-gen}
+
+if [ -z "${IMG_NAME}" ]; then
+	echo "IMG_NAME not set" 1>&2
+	exit 1
+fi
+
+export USE_QEMU="${USE_QEMU:-0}"
+export IMG_DATE="${IMG_DATE:-"$(date +%Y-%m-%d)"}"
+export IMG_FILENAME="${IMG_FILENAME:-"${IMG_DATE}-${IMG_NAME}"}"
+export ZIP_FILENAME="${ZIP_FILENAME:-"image_${IMG_DATE}-${IMG_NAME}"}"
+
+export SCRIPT_DIR="${BASE_DIR}/scripts"
+export WORK_DIR="${WORK_DIR:-"${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"}"
+export DEPLOY_DIR=${DEPLOY_DIR:-"${BASE_DIR}/deploy"}
+export DEPLOY_ZIP="${DEPLOY_ZIP:-2}"
+export LOG_FILE="${WORK_DIR}/build.log"
+
+export TARGET_HOSTNAME=${TARGET_HOSTNAME:-touchprint}
+
+export FIRST_USER_NAME=${FIRST_USER_NAME:-pi}
+export FIRST_USER_PASS=${FIRST_USER_PASS:-raspberry}
+export RELEASE=${RELEASE:-buster}
+export WPA_ESSID
+export WPA_PASSWORD
+export WPA_COUNTRY
+export ENABLE_SSH="${ENABLE_SSH:-0}"
+
+export LOCALE_DEFAULT="${LOCALE_DEFAULT:-en_US.UTF-8}"
+
+export KEYBOARD_KEYMAP="${KEYBOARD_KEYMAP:-us}"
+export KEYBOARD_LAYOUT="${KEYBOARD_LAYOUT:-English (US)}"
+
+export TIMEZONE_DEFAULT="${TIMEZONE_DEFAULT:-America/New_York}"
+
+export GIT_HASH=${GIT_HASH:-"$(git rev-parse HEAD)"}
+
+export CLEAN
+export IMG_NAME
+export APT_PROXY
+
+export STAGE
+export STAGE_DIR
+export STAGE_WORK_DIR
+export PREV_STAGE
+export PREV_STAGE_DIR
+export ROOTFS_DIR
+export PREV_ROOTFS_DIR
+export IMG_SUFFIX
+export NOOBS_NAME
+export NOOBS_DESCRIPTION
+export EXPORT_DIR
+export EXPORT_ROOTFS_DIR
+
+export QUILT_PATCHES
+export QUILT_NO_DIFF_INDEX=1
+export QUILT_NO_DIFF_TIMESTAMPS=1
+export QUILT_REFRESH_ARGS="-p ab"
+
+# shellcheck source=scripts/common
+source "${SCRIPT_DIR}/common"
+# shellcheck source=scripts/dependencies_check
+source "${SCRIPT_DIR}/dependencies_check"
+
+dependencies_check "${BASE_DIR}/depends"
+
+#check username is valid
+if [[ ! "$FIRST_USER_NAME" =~ ^[a-z][-a-z0-9_]*$ ]]; then
+	echo "Invalid FIRST_USER_NAME: $FIRST_USER_NAME"
+	exit 1
+fi
+
+if [[ -n "${APT_PROXY}" ]] && ! curl --silent "${APT_PROXY}" >/dev/null ; then
+	echo "Could not reach APT_PROXY server: ${APT_PROXY}"
+	exit 1
+fi
+
+if [[ -n "${WPA_PASSWORD}" && ${#WPA_PASSWORD} -lt 8 || ${#WPA_PASSWORD} -gt 63  ]] ; then
+	echo "WPA_PASSWORD" must be between 8 and 63 characters
+	exit 1
+fi
+
+mkdir -p "${WORK_DIR}"
+log "Begin ${BASE_DIR}"
+
+STAGE_LIST=${STAGE_LIST:-${BASE_DIR}/stage*}
+
+for STAGE_DIR in $STAGE_LIST; do
+	STAGE_DIR=$(realpath "${STAGE_DIR}")
+	run_stage
+done
+
+CLEAN=1
+for EXPORT_DIR in ${EXPORT_DIRS}; do
+	STAGE_DIR=${BASE_DIR}/export-image
+	# shellcheck source=/dev/null
+	source "${EXPORT_DIR}/EXPORT_IMAGE"
+	EXPORT_ROOTFS_DIR=${WORK_DIR}/$(basename "${EXPORT_DIR}")/rootfs
+	run_stage
+	if [ "${USE_QEMU}" != "1" ]; then
+		if [ -e "${EXPORT_DIR}/EXPORT_NOOBS" ]; then
+			# shellcheck source=/dev/null
+			source "${EXPORT_DIR}/EXPORT_NOOBS"
+			STAGE_DIR="${BASE_DIR}/export-noobs"
+			run_stage
+		fi
+	fi
+done
+
+if [ -x ${BASE_DIR}/postrun.sh ]; then
+	log "Begin postrun.sh"
+	cd "${BASE_DIR}"
+	./postrun.sh
+	log "End postrun.sh"
+fi
+
+log "End ${BASE_DIR}"
--- a/19
+++ b/19
@ -0,0 +1,19 @@
+quilt
+parted
+realpath:coreutils
+qemu-arm-static:qemu-user-static
+debootstrap
+zerofree
+zip
+mkdosfs:dosfstools
+capsh:libcap2-bin
+bsdtar
+grep
+rsync
+xz:xz-utils
+curl
+xxd
+file
+git
+lsmod:kmod
+bc
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -0,0 +1,10 @@
+version: '2'
+
+services:
+  apt-cacher-ng:
+    restart: unless-stopped
+    image: sameersbn/apt-cacher-ng:latest
+    ports:
+    - "3142:3142"
+    volumes:
+    - ./apt-cacher-ng:/var/cache/apt-cacher-ng
--- a/export-image/00-allow-rerun/00-run.sh
+++ b/export-image/00-allow-rerun/00-run.sh
@ -0,0 +1,9 @@
+#!/bin/bash -e
+
+if [ ! -x "${ROOTFS_DIR}/usr/bin/qemu-arm-static" ]; then
+	cp /usr/bin/qemu-arm-static "${ROOTFS_DIR}/usr/bin/"
+fi
+
+if [ -e "${ROOTFS_DIR}/etc/ld.so.preload" ]; then
+	mv "${ROOTFS_DIR}/etc/ld.so.preload" "${ROOTFS_DIR}/etc/ld.so.preload.disabled"
+fi
--- a/export-image/01-set-sources/01-run.sh
+++ b/export-image/01-set-sources/01-run.sh
@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+apt-get update
+apt-get -y dist-upgrade
+apt-get clean
+EOF
--- a/export-image/02-network/01-run.sh
+++ b/export-image/02-network/01-run.sh
@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+install -m 644 files/resolv.conf "${ROOTFS_DIR}/etc/"
--- a/export-image/02-network/files/resolv.conf
+++ b/export-image/02-network/files/resolv.conf
@ -0,0 +1 @@
+nameserver 8.8.8.8
--- a/export-image/03-set-partuuid/00-run.sh
+++ b/export-image/03-set-partuuid/00-run.sh
@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
+
+IMGID="$(dd if="${IMG_FILE}" skip=440 bs=1 count=4 2>/dev/null | xxd -e | cut -f 2 -d' ')"
+
+BOOT_PARTUUID="${IMGID}-01"
+ROOT_PARTUUID="${IMGID}-02"
+
+sed -i "s/BOOTDEV/PARTUUID=${BOOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
+sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
+
+sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/boot/cmdline.txt"
--- a/export-image/04-finalise/01-run.sh
+++ b/export-image/04-finalise/01-run.sh
@ -0,0 +1,112 @@
+#!/bin/bash -e
+
+IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
+INFO_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.info"
+
+echo "Part 1"
+on_chroot << EOF
+if [ -x /etc/init.d/fake-hwclock ]; then
+	/etc/init.d/fake-hwclock stop
+fi
+if hash hardlink 2>/dev/null; then
+	hardlink -t /usr/share/doc
+fi
+EOF
+
+echo "Part 2"
+if [ -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config" ]; then
+	chmod 700 "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config"
+fi
+
+echo "Part 3"
+rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
+rm -f "${ROOTFS_DIR}/usr/bin/qemu-arm-static"
+
+echo "Part 4"
+if [ "${USE_QEMU}" != "1" ]; then
+	if [ -e "${ROOTFS_DIR}/etc/ld.so.preload.disabled" ]; then
+		mv "${ROOTFS_DIR}/etc/ld.so.preload.disabled" "${ROOTFS_DIR}/etc/ld.so.preload"
+	fi
+fi
+
+echo "Part 5"
+rm -f "${ROOTFS_DIR}/etc/network/interfaces.dpkg-old"
+
+rm -f "${ROOTFS_DIR}/etc/apt/sources.list~"
+rm -f "${ROOTFS_DIR}/etc/apt/trusted.gpg~"
+
+rm -f "${ROOTFS_DIR}/etc/passwd-"
+rm -f "${ROOTFS_DIR}/etc/group-"
+rm -f "${ROOTFS_DIR}/etc/shadow-"
+rm -f "${ROOTFS_DIR}/etc/gshadow-"
+rm -f "${ROOTFS_DIR}/etc/subuid-"
+rm -f "${ROOTFS_DIR}/etc/subgid-"
+
+rm -f "${ROOTFS_DIR}"/var/cache/debconf/*-old
+rm -f "${ROOTFS_DIR}"/var/lib/dpkg/*-old
+
+rm -f "${ROOTFS_DIR}"/usr/share/icons/*/icon-theme.cache
+
+rm -f "${ROOTFS_DIR}/var/lib/dbus/machine-id"
+
+true > "${ROOTFS_DIR}/etc/machine-id"
+
+ln -nsf /proc/mounts "${ROOTFS_DIR}/etc/mtab"
+
+find "${ROOTFS_DIR}/var/log/" -type f -exec cp /dev/null {} \;
+
+rm -f "${ROOTFS_DIR}/root/.vnc/private.key"
+rm -f "${ROOTFS_DIR}/etc/vnc/updateid"
+
+echo "Part 6"
+update_issue "$(basename "${EXPORT_DIR}")"
+install -m 644 "${ROOTFS_DIR}/etc/rpi-issue" "${ROOTFS_DIR}/boot/issue.txt"
+
+cp "$ROOTFS_DIR/etc/rpi-issue" "$INFO_FILE"
+
+echo "Part 7"
+{
+	if [ -f "$ROOTFS_DIR/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" ]; then
+		firmware=$(zgrep "firmware as of" \
+			"$ROOTFS_DIR/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" | \
+			head -n1 | sed  -n 's|.* \([^ ]*\)$|\1|p')
+		printf "\nFirmware: https://github.com/raspberrypi/firmware/tree/%s\n" "$firmware"
+
+		kernel="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/git_hash")"
+		printf "Kernel: https://github.com/raspberrypi/linux/tree/%s\n" "$kernel"
+
+		uname="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/uname_string7")"
+		printf "Uname string: %s\n" "$uname"
+	fi
+
+	printf "\nPackages:\n"
+	dpkg -l --root "$ROOTFS_DIR"
+} >> "$INFO_FILE"
+
+ROOT_DEV="$(mount | grep "${ROOTFS_DIR} " | cut -f1 -d' ')"
+
+echo "Part 8"
+unmount "${ROOTFS_DIR}"
+zerofree "${ROOT_DEV}"
+
+unmount_image "${IMG_FILE}"
+
+mkdir -p "${DEPLOY_DIR}"
+
+rm -f "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.zip"
+rm -f "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
+
+echo "Part 9"
+if [ "${DEPLOY_ZIP}" == "1" ]; then
+	pushd "${STAGE_WORK_DIR}" > /dev/null
+	zip "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.zip" \
+		"$(basename "${IMG_FILE}")"
+	popd > /dev/null
+elif [ "${DEPLOY_ZIP}" == "2" ]; then
+  xz -z -c -T$(nproc) "$IMG_FILE" > "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img.xz"
+else
+	cp "$IMG_FILE" "$DEPLOY_DIR"
+fi
+
+echo "Part 10"
+cp "$INFO_FILE" "$DEPLOY_DIR"
--- a/export-image/prerun.sh
+++ b/export-image/prerun.sh
@ -0,0 +1,61 @@
+#!/bin/bash -e
+
+IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
+
+unmount_image "${IMG_FILE}"
+
+rm -f "${IMG_FILE}"
+
+rm -rf "${ROOTFS_DIR}"
+mkdir -p "${ROOTFS_DIR}"
+
+BOOT_SIZE="$((256 * 1024 * 1024))"
+ROOT_SIZE=$(du --apparent-size -s "${EXPORT_ROOTFS_DIR}" --exclude var/cache/apt/archives --exclude boot --block-size=1 | cut -f 1)
+
+# All partition sizes and starts will be aligned to this size
+ALIGN="$((4 * 1024 * 1024))"
+# Add this much space to the calculated file size. This allows for
+# some overhead (since actual space usage is usually rounded up to the
+# filesystem block size) and gives some free space on the resulting
+# image.
+ROOT_MARGIN="$(echo "($ROOT_SIZE * 0.2 + 200 * 1024 * 1024) / 1" | bc)"
+
+BOOT_PART_START=$((ALIGN))
+BOOT_PART_SIZE=$(((BOOT_SIZE + ALIGN - 1) / ALIGN * ALIGN))
+ROOT_PART_START=$((BOOT_PART_START + BOOT_PART_SIZE))
+ROOT_PART_SIZE=$(((ROOT_SIZE + ROOT_MARGIN + ALIGN  - 1) / ALIGN * ALIGN))
+IMG_SIZE=$((BOOT_PART_START + BOOT_PART_SIZE + ROOT_PART_SIZE))
+
+truncate -s "${IMG_SIZE}" "${IMG_FILE}"
+
+parted --script "${IMG_FILE}" mklabel msdos
+parted --script "${IMG_FILE}" unit B mkpart primary fat32 "${BOOT_PART_START}" "$((BOOT_PART_START + BOOT_PART_SIZE - 1))"
+parted --script "${IMG_FILE}" unit B mkpart primary ext4 "${ROOT_PART_START}" "$((ROOT_PART_START + ROOT_PART_SIZE - 1))"
+
+PARTED_OUT=$(parted -sm "${IMG_FILE}" unit b print)
+BOOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^1:' | cut -d':' -f 2 | tr -d B)
+BOOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^1:' | cut -d':' -f 4 | tr -d B)
+
+ROOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^2:' | cut -d':' -f 2 | tr -d B)
+ROOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^2:' | cut -d':' -f 4 | tr -d B)
+
+BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}")
+ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}")
+echo "/boot: offset $BOOT_OFFSET, length $BOOT_LENGTH"
+echo "/:     offset $ROOT_OFFSET, length $ROOT_LENGTH"
+
+ROOT_FEATURES="^huge_file"
+for FEATURE in metadata_csum 64bit; do
+	if grep -q "$FEATURE" /etc/mke2fs.conf; then
+	    ROOT_FEATURES="^$FEATURE,$ROOT_FEATURES"
+	fi
+done
+mkdosfs -n boot -F 32 -v "$BOOT_DEV" > /dev/null
+mkfs.ext4 -L rootfs -O "$ROOT_FEATURES" "$ROOT_DEV" > /dev/null
+
+mount -v "$ROOT_DEV" "${ROOTFS_DIR}" -t ext4
+mkdir -p "${ROOTFS_DIR}/boot"
+mount -v "$BOOT_DEV" "${ROOTFS_DIR}/boot" -t vfat
+
+rsync -aHAXx --exclude /var/cache/apt/archives --exclude /boot "${EXPORT_ROOTFS_DIR}/" "${ROOTFS_DIR}/"
+rsync -rtx "${EXPORT_ROOTFS_DIR}/boot/" "${ROOTFS_DIR}/boot/"
--- a/export-noobs/00-release/00-run.sh
+++ b/export-noobs/00-release/00-run.sh
@ -0,0 +1,43 @@
+#!/bin/bash -e
+
+NOOBS_DIR="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"
+
+install -v -m 744	files/partition_setup.sh	"${NOOBS_DIR}/"
+install -v		files/partitions.json		"${NOOBS_DIR}/"
+install -v		files/os.json			"${NOOBS_DIR}/"
+install -v		files/OS.png			"${NOOBS_DIR}/"
+install -v		files/release_notes.txt		"${NOOBS_DIR}/"
+
+tar -v -c -C		files/marketing			-f "${NOOBS_DIR}/marketing.tar" .
+
+BOOT_SHASUM="$(sha256sum "${NOOBS_DIR}/boot.tar.xz" | cut -f1 -d' ')"
+ROOT_SHASUM="$(sha256sum "${NOOBS_DIR}/root.tar.xz" | cut -f1 -d' ')"
+
+BOOT_SIZE="$(xz --robot -l "${NOOBS_DIR}/boot.tar.xz"  | grep totals | cut -f 5)"
+ROOT_SIZE="$(xz --robot -l "${NOOBS_DIR}/root.tar.xz"  | grep totals | cut -f 5)"
+
+BOOT_SIZE="$(( BOOT_SIZE / 1024 / 1024 + 1))"
+ROOT_SIZE="$(( ROOT_SIZE / 1024 / 1024 + 1))"
+
+BOOT_NOM="256"
+ROOT_NOM="$(( ROOT_SIZE + 400 ))"
+
+mv "${NOOBS_DIR}/OS.png" "${NOOBS_DIR}/${NOOBS_NAME// /_}.png"
+
+sed "${NOOBS_DIR}/partitions.json" -i -e "s|BOOT_SHASUM|${BOOT_SHASUM}|"
+sed "${NOOBS_DIR}/partitions.json" -i -e "s|ROOT_SHASUM|${ROOT_SHASUM}|"
+
+sed "${NOOBS_DIR}/partitions.json" -i -e "s|BOOT_SIZE|${BOOT_SIZE}|"
+sed "${NOOBS_DIR}/partitions.json" -i -e "s|ROOT_SIZE|${ROOT_SIZE}|"
+
+sed "${NOOBS_DIR}/partitions.json" -i -e "s|BOOT_NOM|${BOOT_NOM}|"
+sed "${NOOBS_DIR}/partitions.json" -i -e "s|ROOT_NOM|${ROOT_NOM}|"
+
+sed "${NOOBS_DIR}/os.json" -i -e "s|UNRELEASED|${IMG_DATE}|"
+sed "${NOOBS_DIR}/os.json" -i -e "s|NOOBS_NAME|${NOOBS_NAME}|"
+sed "${NOOBS_DIR}/os.json" -i -e "s|NOOBS_DESCRIPTION|${NOOBS_DESCRIPTION}|"
+sed "${NOOBS_DIR}/os.json" -i -e "s|RELEASE|${RELEASE}|"
+
+sed "${NOOBS_DIR}/release_notes.txt" -i -e "s|UNRELEASED|${IMG_DATE}|"
+
+cp -a "${NOOBS_DIR}" "${DEPLOY_DIR}/"
--- a/export-noobs/00-release/files/OS.png
+++ b/export-noobs/00-release/files/OS.png
--- a/export-noobs/00-release/files/marketing/slides_vga/A.png
+++ b/export-noobs/00-release/files/marketing/slides_vga/A.png
--- a/export-noobs/00-release/files/marketing/slides_vga/B.png
+++ b/export-noobs/00-release/files/marketing/slides_vga/B.png
--- a/export-noobs/00-release/files/marketing/slides_vga/C.png
+++ b/export-noobs/00-release/files/marketing/slides_vga/C.png
--- a/export-noobs/00-release/files/marketing/slides_vga/D.png
+++ b/export-noobs/00-release/files/marketing/slides_vga/D.png
--- a/export-noobs/00-release/files/marketing/slides_vga/E.png
+++ b/export-noobs/00-release/files/marketing/slides_vga/E.png
--- a/export-noobs/00-release/files/marketing/slides_vga/F.png
+++ b/export-noobs/00-release/files/marketing/slides_vga/F.png
--- a/export-noobs/00-release/files/marketing/slides_vga/G.png
+++ b/export-noobs/00-release/files/marketing/slides_vga/G.png
--- a/export-noobs/00-release/files/os.json
+++ b/export-noobs/00-release/files/os.json
@ -0,0 +1,20 @@
+{
+    "description": "NOOBS_DESCRIPTION",
+    "feature_level": 35120124,
+    "kernel": "4.19",
+    "name": "NOOBS_NAME",
+    "password": "raspberry",
+    "release_date": "UNRELEASED",
+    "supported_hex_revisions": "2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19,1040,1041,0092,0093,2082",
+    "supported_models": [
+        "Pi Model",
+        "Pi 2",
+        "Pi Zero",
+        "Pi 3",
+        "Pi Compute Module 3",
+        "Pi 4"
+    ],
+    "url": "http://www.raspbian.org/",
+    "username": "pi",
+    "version": "RELEASE"
+}
--- a/export-noobs/00-release/files/partition_setup.sh
+++ b/export-noobs/00-release/files/partition_setup.sh
@ -0,0 +1,46 @@
+#!/bin/sh
+#supports_backup in PINN
+
+set -ex
+
+# shellcheck disable=SC2154
+if [ -z "$part1" ] || [ -z "$part2" ]; then
+  printf "Error: missing environment variable part1 or part2\n" 1>&2
+  exit 1
+fi
+
+mkdir -p /tmp/1 /tmp/2
+
+mount "$part1" /tmp/1
+mount "$part2" /tmp/2
+
+sed /tmp/1/cmdline.txt -i -e "s|root=[^ ]*|root=${part2}|"
+sed /tmp/2/etc/fstab -i -e "s|^[^#].* / |${part2}  / |"
+sed /tmp/2/etc/fstab -i -e "s|^[^#].* /boot |${part1}  /boot |"
+
+# shellcheck disable=SC2154
+if [ -z "$restore" ]; then
+  if [ -f /mnt/ssh ]; then
+    cp /mnt/ssh /tmp/1/
+  fi
+
+  if [ -f /mnt/ssh.txt ]; then
+    cp /mnt/ssh.txt /tmp/1/
+  fi
+
+  if [ -f /settings/wpa_supplicant.conf ]; then
+    cp /settings/wpa_supplicant.conf /tmp/1/
+  fi
+
+  if ! grep -q resize /proc/cmdline; then
+    if ! grep -q splash /tmp/1/cmdline.txt; then
+      sed -i "s| quiet||g" /tmp/1/cmdline.txt
+    fi
+    sed -i 's| init=/usr/lib/raspi-config/init_resize.sh||' /tmp/1/cmdline.txt
+  else
+    sed -i '1 s|.*|& sdhci.debug_quirks2=4|' /tmp/1/cmdline.txt
+  fi
+fi
+
+umount /tmp/1
+umount /tmp/2
--- a/export-noobs/00-release/files/partitions.json
+++ b/export-noobs/00-release/files/partitions.json
@ -0,0 +1,22 @@
+{
+    "partitions": [
+        {
+            "filesystem_type": "FAT",
+            "label": "boot",
+            "mkfs_options": "-F 32",
+            "partition_size_nominal": BOOT_NOM,
+            "uncompressed_tarball_size": BOOT_SIZE,
+            "want_maximised": false,
+            "sha256sum": "BOOT_SHASUM"
+        },
+        {
+            "filesystem_type": "ext4",
+            "label": "root",
+            "mkfs_options": "-O ^huge_file",
+            "partition_size_nominal": ROOT_NOM,
+            "uncompressed_tarball_size": ROOT_SIZE,
+            "want_maximised": true,
+            "sha256sum": "ROOT_SHASUM"
+        }
+    ]
+}
--- a/export-noobs/00-release/files/release_notes.txt
+++ b/export-noobs/00-release/files/release_notes.txt
@ -0,0 +1,525 @@
+UNRELEASED:
+  *
+2020-05-27
+  * Added Bookshelf application
+  * Added Raspberry Pi Diagnostics application
+  * Added magnifier plugin to taskbar - needs magnifier application installed from Recommended Software to enable
+  * Added Magnifier application to Recommended Software
+  * Added marketing questionnaire as initial Chromium tab
+  * Version 0.25 of Scratch 2 included - uses external application to access IMU on SenseHAT
+  * Version 1.0.5 of Scratch 3 included - uses external application to access IMU on SenseHAT
+  * Version 32.0.0.371 of Flash player included
+  * Version 1.0.6 of Node-RED included
+  * Version 6.7.1 of VNC Server included
+  * Version 6.20.113 of VNC Client included
+  * Internal audio outputs enabled as separate ALSA devices
+  * MagPi preinstall removed and replaced with Beginner’s Guide
+  * MagPi weblink removed from main menu
+  * Chromium made default application for PDF files
+  * Common icon loading code for lxpanel plugins used
+  * Italian translations added
+  * Initial move of mouse pointer to menu button disabled
+  * Padding at left of menu button removed
+  * Focus behaviour changed so that focus moves to desktop if no windows are opened - improves reliability of Orca screen reader
+  * Bug fix - focus bug in volume plugin
+  * Bug fix - keyboard repeat interval bug in Mouse & Keyboard Settings
+  * Bug fix - battery detection bug in battery plugin
+  * Bug fix - spurious active areas on taskbar when plugins are hidden
+  * Bug fix - occasional crash in file manager on file selection
+  * Disk ID is now regenerated on first boot
+  * Updated udev rules
+    - Remove unused argon rule
+    - Add vcsm-cma to video group
+    - Add pwm to gpio group
+  * i2cprobe: More flexible I2C/SPI alias mapping
+  * Raspberry Pi firmware 21e1fe3477ffb708a5736ed61a924fd650031136
+  * Linux kernel 4.19.118
+2020-02-13:
+  * Raspberry Pi Configuration - screen blanking setting disabled if Xscreensaver is installed
+  * Bug fix - switch to turn off VNC server in Raspberry Pi Configuration has no effect
+  * Bug fix - fix %20 characters in file names
+  * Linux kernel 4.19.97
+  * Raspberry Pi firmware 9a34efbf2fc6a27231607ce91a7cb6bf3bdbc0c5
+    - gencmd: Fix measure_clock name for CLOCK_OUTPUT_108
+    - mmal isp: Remote alignment requirements for RGB24 formats
+    - Add missing flags for VC_IMAGE_PROP_YUVUV_4K_CHROMA_ALIGN
+    - platform: Compromise on gpu overclock settings
+2020-02-05:
+  * Version 3.2.6 of Thonny included - significant improvements in speed, particularly when debugging
+  * Version 1.0.4 of Scratch 3 included - adds new "display stage" and "display sprite" blocks to SenseHAT extension, and loading of files from command line
+  * Version 32.0.0.314 of Flash player included
+  * Version 1.0.3 of NodeRED included
+  * Version 6.6.0 of RealVNC Server and version 6.19.923 of RealVNC Viewer included - adds support for audio
+  * Version 78.0.3904.108 of Chromium included
+  * Mesa updated to 19.3.2 for OpenGL ES 3.1 conformance
+  * Pixel doubling option added in Raspberry Pi Configuration on platforms using FKMS display driver
+  * Orca screen reader added to Recommended Software
+  * Code The Classics Python games added to Recommended Software
+  * File manager - new "places" pane added at top of sidebar to show mounted drives in simplified view; "new folder" icon added to taskbar; expanders in directory browser now correctly show state of subfolders
+  * Multiple monitor support improved - alignment of icons on second desktop corrected, Appearance Settings opens on correct tab when launched from context menu
+  * Raspberry Pi Touchscreen correctly aligned with display
+  * System clock synchronised before installing new packages in startup wizard and Recommended Software
+  * Mixer dialogs added to taskbar volume plugin; separate Audio Preferences application removed
+  * Raspberry Pi Configuration - separate tab added for display options; screen blanking control added
+  * Volume taskbar plugin and raspi-config modified to support separate ALSA devices for internal audio outputs (analogue and HDMI 1 and 2)
+  * Robustness improvements in volume, ejecter and battery taskbar plugins
+  * Movement of mouse pointer to menu button on startup now controlled by point_at_menu parameter in Global section of lxpanel configuration file
+  * Ctrl-Alt-Del and Ctrl-Alt-End shortcuts added to open shutdown options box
+  * Ctrl-Shift-Esc shortcut added to open task manager
+  * Enabled NEON routines in OpenSSL
+  * Linux kernel 4.19.97
+  * Raspberry Pi firmware 149cd7f0487e08e148efe604f8d4d359541cecf4
+2019-09-26:
+  * rpi-eeprom included
+    - This will automatically update the SPI EEPROM on the Raspberry Pi 4 to the latest stable version.
+       See https://rpf.io/eeprom for more information.
+  * New icon theme for file manager icons
+  * Appearance Settings - option for identical desktop on both monitors
+  * Appearance Settings - option to show different desktop icons on both monitors
+  * Taskbar automatically moved to monitor 0 if monitor 1 not found at boot
+  * Switching of audio output between two HDMI devices added to volume plugin
+  * Switching of audio input devices added to volume plugin
+  * .asoundrc (ALSA config file) now uses 'plug' values to support more devices
+  * Audio Settings tool modified to integrate more closely with volume plugin to reduce duplicated code
+  * Screen Configuration tool now shows separate menus for resolution and refresh rate
+  * Primary and active monitor settings removed from Screen Configuration tool
+  * Overscan support added for FKMS driver
+  * New keyboard shortcuts added - Ctrl-Alt-End brings up shutdown menu; Ctrl-Alt-M moves taskbar between monitors
+  * Latest changes to Bluez ALSA interface integrated to improve connection to Bluetooth audio devices
+  * Mousepad used as simple text editor instead of leafpad
+  * Version 3.2 of Thonny added
+  * Version 74 of Chromium added
+  * Version 3.0.8 of VLC added
+  * Version 32.0.0.255 of Flash player added
+  * Version 6.5.0 of RealVNC Server added
+  * Version 6.19.715 of RealVNC Viewer added (full image only)
+  * Version 12.0.1 of Mathematica added (full image only)
+  * Version 0.20.8 of NodeRED added (full image only)
+  * Version 3.1.0 of Sonic Pi added (full image only)
+  * Scratch 3 added (full image only)
+  * Bug fix - URL handling in Terminal
+  * Bug fix - octal values in SSIDs in network plugin
+  * Bug fix - remaining value in progress bar when transferring files
+  * Bug fix - integration of xarchiver tool with file manager
+  * Bug fix - start menu opening on incorrect monitor
+  * Bug fix - minimised applications wrongly displayed on taskbar on second monitor
+  * Bug fix - Bluetooth icon disappearing on x86 platforms when Bluetooth turned off
+  * Bug fix - Screen Configuration tool not shown on x86 platforms and settings not being saved
+  * Various translation updates
+  * Various minor bug fixes
+  * Epiphany/Web removed
+  * ntfs-3g included
+  * pciutils added
+  * Linux kernel 4.19.75
+  * Raspberry Pi firmware 01508e81ec1e918448227ca864616d56c430b46d
+2019-07-10:
+  * Clearer options for switching of Pi 4 video output in Raspberry Pi Configuration
+  * Option added to Appearance Settings to move taskbar to second monitor
+  * Option added to Recommended Software to restrict package installs by architecture
+  * New version of Adobe Flash player (32.0.0.223)
+  * Selection of screen refresh rates added to Screen Configuration
+  * Fix for missing text insertion cursor in LibreOffice on Pi 4
+  * Fix for Wi-fi interruption when Wi-fi icon on taskbar is clicked
+  * FIx for incorrect desktop background behind desktop login prompt
+  * Fix for segmentation faults when launching obconf and lxapperarance
+  * Fix for unclosed file pointer in Screen Configuration
+  * Fix for Bluetooth plugin freeze when large numbers of devices detected
+  * Fix for opening URLs not working in lxterminal
+  * Fix for start menu opening on incorrect monitor when launched from keyboard
+  * Fix for taskbar item not having [] removed when un-minimising on second monitor
+  * Fix for Chromium video playback and WebGL performance on Pi 4
+  * Remove 4kp60 option from Raspberry Pi Configuration
+  * Rename hdmi_enable_4k to hdmi_enable_4kp60 in /boot/config.txt and raspi-config
+  * Linux kernel 4.19.57
+  * Raspberry Pi firmware 356f5c2880a3c7e8774025aa6fc934a617553e7b
+2019-06-20:
+  * Based on Debian Buster
+  * Support for Raspberry Pi 4 hardware
+  * FKMS OpenGL desktop graphics driver and xcompmgr compositing window manager used when running on Raspberry Pi 4
+  * Screen Configuration application added for use with FKMS driver
+  * Raspberry Pi 4 video output options added to Raspberry Pi Configuration
+  * Uses new PiXflat UI theme for GTK and Openbox
+  * CPU activity gauge plugin no longer shown on taskbar by default
+  * CPU temperature gauge plugin added (not shown by default)
+  * USB ejecter and Bluetooth taskbar icons hidden when not appropriate
+  * Version 74.0.3729.157 of Chromium web browser included
+  * Version 32.0.0.207 of Flash player included
+  * IDLE Python IDE removed
+  * Wolfram Mathematica removed temporarily due to incompatibility with Buster
+  * Display of package sizes removed from Recommended Software
+  * Appearance Settings modified to support independent settings for two monitors
+  * Oracle Java 7 and 8 replaced with OpenJDK 11
+  * Miscellaneous small bug fixes
+  * On-board 5GHz WiFi blocked by rfkill by default
+    The block is removed when taking one of the following actions:
+    - Selecting a locale in the first run wizard
+    - Setting the WiFi country in the Raspberry Pi Configuration tool or the Network Settings applet
+    - Setting the WiFi country in raspi-config
+    - Providing a wpa_supplicant.conf file through the boot partition
+    - Running 'rfkill unblock wifi'
+  * Boot partition size set to 256M
+  * Linux kernel 4.19.50
+  * Raspberry Pi firmware 88ca9081f5e51cdedd16d5dbc85ed12a25123201
+2019-04-08:
+  * Chromium browser updated to version 72
+  * VLC media player updated to version 3.0.6
+  * RealVNC Server updated to version 6.4.0
+  * Flash player updated to version 32.0.0.156
+  * Performance improvements to SDL library
+  * Performance improvements to pixman library
+  * Option to set display underscan added to startup wizard
+  * Mounted external drives now displayed on desktop by default
+  * Network plugin modified for improved compatibility with wpa_passphrase
+  * SD Card Copier tweaks to reduce copy failures
+  * Various minor bug fixes and appearance tweaks
+  * Added ethtool
+  * Added rng-tools
+  * Add PINN restore support
+  * Linux kernel 4.14.98
+  * Raspberry Pi firmware f8939644f7bd3065068787f1f92b3f3c79cf3de9
+2018-11-13:
+  * Two versions of image created - "base" image has no optional software packages included; "full" image has all optional packages
+    - Removed from "base" image - LibreOffice, Thonny, Scratch, Scratch 2, Sonic Pi, Minecraft, Python Games, SmartSim, SenseHAT Emulator
+    - Added to "full" image - Mathematica, BlueJ, Greenfoot, Node-RED, Claws Mail, VNC Viewer
+  * Python Games and SmartSim added to Recommended Software
+  * VLC media player with VideoCore hardware acceleration included in image
+  * Version 3.0.5 of Thonny included
+  * Modifications to LXDE components to enable local configuration to override global configuration correctly
+  * Modifications to Appearance Settings to support above configuration changes
+  * Modifications to various initial config defaults and relevant package to support above configuration changes
+  * Selecting default option in Appearance Settings now deletes relevant local configuration files
+  * PiX theme modified so that all changes made in Appearance Settings are in override files rather than in theme files
+  * Design of scrollbar buttons changed
+  * Image Viewer moved into Graphics category on main menu
+  * Recommended Software now installs LibreOffice language support files if needed, and suggests reboot if needed
+  * Latest version of Pepper Flash plugin included
+  * Chromium h264ify plugin permissions set correctly by default
+  * Corrections to various MIME types so that files open in sensible default applications
+  * Set default timezone to 'Europe/London'
+  * Linux kernel 4.14.79
+  * Raspberry Pi firmware 12e0bf86e08d6067372bc0a45d7e8a10d3113210
+2018-10-09:
+  * Raspberry Pi 3A+ support
+  * In startup wizard, assign keyboard to country as per Debian installer recommendations
+  * In startup wizard, add option to use US keyboard in preference to country-specific option
+  * In startup wizard, show IP address on first page
+  * In startup wizard, check for existing wifi network connection and show it if there is one
+  * In startup wizard, install language support packages for LibreOffice and other applications
+  * In startup wizard, improve operation with keyboard only and no mouse
+  * Password change in Raspberry Pi Configuration and startup wizard now works properly if passwords contain shell characters
+  * Battery indicator plugin modified to cope with Pi-top hardware monitor crashing
+  * Networking plugin hides wifi password characters by default
+  * In Scratch 2 GPIO plugin, set pin from dropdown list rather than free text
+  * In Scratch 2 SenseHAT plugin, swap x and y axis values for LED array
+  * Include latest Adobe Flash player (31.0.0.108)
+  * Include latest RealVNC Server (6.3.1)
+  * Include libav-tools
+  * Include ssh-import-id
+  * Removed Mathematica
+  * Merge in latest third-party code for Bluetooth ALSA interface
+  * Add ability to prevent software update changing configuration files, by creating ~/.config/.lock file
+  * Various other small bug fixes, tweaks and changes to text
+  * Make dhcpcd work with 3G devices
+  * Add hw acceleration to ffmpeg
+  * Improved WiFi-BT coexistence parameters
+  * Run fake-hwclock before systemd-fsck-root
+  * Raspberry Pi PoE HAT support
+  * Linux kernel 4.14.71
+  * Raspberry Pi firmware 5b49caa17e91d0e64024380119ad739bb201c674
+2018-06-27:
+  * New first-boot configuration wizard added
+  * Recommended Software installer added
+  * Bluej, Greenfoot, NodeRED, Claws Mail, VNC Viewer removed from image - can now be installed from Recommended Applications
+  * Qpdfview PDF viewer installed instead of Xpdf
+  * Version 65.0 of Chromium browser included, with latest Flash player
+  * Volume up / down keys now change by 5% increments and affect currently-selected output device rather than internal device only
+  * Network plugin now remembers previously-entered WiFi network passwords when prompting for reconnection
+  * Serial port and serial console can now be switched separately in Raspberry Pi Configuration
+  * Lxkeymap keyboard language setting application removed - replaced with dialog within Raspberry Pi Configuration
+  * Wifi country and keyboard language setting dialogs in Raspberry Pi Configuration now callable from other applications
+  * New version of Piboto font included to render with correct weight under some rogue applications
+  * Reconnection to Bluetooth audio devices on reboot improved
+  * Disable click-to-rename behaviour in file manager if single-click selection enabled
+  * Appearance Settings dialog makes config changes to some Qt files to match selected theme
+  * MIME file type associations improved
+  * Multiple desktop management options removed from mouse middle-click menu
+  * Menu shortcuts to Raspberry Pi website amended
+  * Python 2 IDLE menu link removed
+  * Sample Magpi PDF installed in /home/pi/MagPi
+  * Various minor tweaks, bug fixes and appearance changes
+  * Bluetooth updates
+    - Firmware with Bluetooth 4.2 features
+    - SCO profile suppot added via bthelper.service
+  * Linux kernel 4.14.50+
+  * Raspberry Pi firmware 748fb17992426bb29d99224b93cb962fefbdc833
+2018-04-18:
+  * Fixed race between wifi-country.service and raspberrypi-net-mods.service
+  * Linux kernel 4.14.34+
+  * Raspberry Pi firmware 5db8e4e1c63178e200d6fbea23ed4a9bf4656658
+2018-03-13:
+  * Raspberry Pi 3 B+ support
+  * WiFi is disabled until wireless regulatory domain is set (Pi 3 B+ only)
+    - The domain can be done through 'Raspberry Pi Configuration' (rc_gui),
+      'raspi-config' or by setting 'country=' to an appropriate ISO 3166
+      alpha2 country code in /etc/wpa_supplicant/wpa_supplicant.conf.
+  * Default wireless regulatory domain is now unset
+  * Added support to desktop for different screen sizes and resolutions,
+    including multiple preset options in Appearance Settings and pixel doubling
+    option in Raspberry Pi Configuration
+  * Version 2.1.16 of Thonny included
+  * Version 29.0.0.113 of Adobe PepperFlash player included
+  * Version 1.2.post1 of Pygame Zero included
+  * Bluetooth plugin now supports connection to Bluetooth LE HID devices
+  * Network plugin now indicates 5G-compatible APs
+  * Latest changes to Bluez ALSA service merged
+    - service now started on CLI boot as well as GUI boot
+  * Latest changes to dhcpcd networking plugin merged
+  * Improved support for running on pi-top devices
+  * Small design changes to PiX theme and icons
+  * Bug fix - hide spurious window resize handles
+  * Bug fix - Scratch 2 remote GPIO state block now works correctly
+  * Updated WiFi Firmware
+    - brcmfmac43455-sdio 7.45.154
+    - brcmfmac43430-sdio 7.45.98.38
+  * New packages:
+    - policykit-1
+    - obconf
+    - python-buttonshim python3-buttonshim
+    - python-unicornhathd  python3-unicornhathd
+    - python-pantilthat python3-pantilthat
+  * Linux kernel 4.9.80+
+  * Raspberry Pi firmware 3347884c7df574bbabeff6dca63caf686e629699
+2017-11-29:
+  * Added battery monitor plugin for taskbar - works on x86 images or first-generation Pi-Top
+  * Added cutdown mode to PCManFM file manager to reduce complexity
+  * Added ability to rename files in PCManFM by clicking name when selected
+  * Bug fix in Bluetooth ALSA module to reduce truncation of audio at end of playback
+  * Various small tweaks, bug fixes and theme modifications
+  * New kernel and firmware
+2017-09-07:
+  * Disable predictable network interface names for Ethernet devices
+  * Bug fix for keyboard settings dialog in Raspberry Pi Configuration
+  * Bug fix for crash on some videos and animations in Chromium
+  * Bug fix for taskbar crash when running RealVNC server
+  * Bug fix for reloading projects with extensions in Scratch 2
+  * Bug fix for MAC address problem in Bluetooth
+  * Simple mode and new icons in Thonny
+  * New Japanese translations in Raspberry Pi Configuration
+  * Install fonts-droid-fallback for international fonts
+2017-08-16:
+  * Based on Raspbian Stretch (Debian version 9)
+  * Version 60 of Chromium browser included
+  * Version 3.0.1 of Sonic Pi included
+  * Version 6.1.1 of RealVNC included
+  * Version 0.17.4 of NodeRED included
+  * Bluetooth audio routed via ALSA rather than Pulseaudio
+  * SenseHAT extension added to Scratch 2
+  * Various desktop applications modified to prompt for sudo password if needed
+  * lxinput control options for mouse speed simplified
+  * lxpanel plugins moved into separate packages
+  * Wireless firmware for Pi 3 and Pi 0W modified to address Broadpwn exploit
+  * Latest kernel and firmware
+  * Various small tweaks, bug fixes and theme modifications
+2017-07-05:
+  * New kernel and firmware
+  * Filesystem created without the metadata_csum feature
+2017-06-21:
+  * Scratch 2 application included
+  * Thonny Python IDE included
+  * New icons with thinner outlines
+  * Volume control more linear in behaviour
+  * Updated Flash player
+  * Updated RealVNC server and viewer
+  * Various tweaks and bugfixes
+  * New kernel and firmware
+2017-04-10:
+  * Wolfram Mathematica updated to version 11.0.1
+  * Adobe Flash Player updated to version 25.0.0.127
+  * Use PARTUUID to support USB boot
+2017-03-02:
+  * Updated kernel and firmware (final Pi Zero W support)
+  * Wolfram Mathematica updated to version 11
+  * NOOBS installs now checks for presence of 'ssh' file on the NOOBS partition.
+2017-02-16:
+  * Chromium browser updated to version 56
+  * Adobe Flash Player updated to version 24.0.0.221
+  * RealVNC Server and Viewer updated to version 6.0.2 (RealVNC Connect)
+  * Sonic Pi updated to version 2.11
+  * Node-RED updated to version 0.15.3
+  * Scratch updated to version 120117
+  * Detection of SSH enabled with default password moved into PAM
+  * Updated desktop GL driver to support use of fake KMS option
+  * Raspberry Pi Configuration and raspi-config allow setting of fixed HDMI resolution
+  * raspi-config allows enabling of serial hardware independent of serial terminal
+  * Updates to kernel and firmware
+  * Various minor bug fixes and usability and appearance tweaks
+2017-01-11:
+  * Re-release of the 2016-11-25 image with a FAT32-formatted boot partition
+2016-11-25:
+  * SSH disabled by default; can be enabled by creating a file with name "ssh" in boot partition
+  * Prompt for password change at boot when SSH enabled with default password unchanged
+  * Adobe Flash Player included
+  * Updates to hardware video acceleration in Chromium browser
+  * Greeter now uses background image from last set in Appearance Settings rather than pi user
+  * Updated version of Scratch
+  * Rastrack option removed from raspi-config and Raspberry Pi Configuration
+  * Ability to disable graphical boot splash screen added to raspi-config and Raspberry Pi Configuration
+  * Appearance Settings dialog made tabbed to work better on small screens
+  * Raspberry Pi Configuration now requires current password to change password
+  * Various small bug fixes
+  * Updated firmware and kernel
+2016-09-23:
+  * New PIXEL desktop environment - new icon set, window design, desktop images, splash screen and greeter
+  * Chromium web browser included
+  * Infinality font rendering patches included
+  * RealVNC server and viewer included
+  * SenseHAT emulator included
+  * Rfkill entries added to Wifi and Bluetooth panel plugins
+  * Updates to various standard applications, including Scratch and NodeRED
+  * Various bug fixes, tweaks and translation updates
+  * Updated firmware and kernel (https://github.com/raspberrypi/firmware/commit/ad8608c08b122b2c228dba0ff5070d6e9519faf5)
+2016-05-27:
+  * Fixed crash of lxpanel when D-bus not accessible
+  * Fixed permissions for D-bus Bluetooth access
+  * Removed sudo from shutdown options
+  * Appearance of tooltips updated in theme
+  * Fixed ejecter plugin grabbing focus
+  * raspi-config command line and GUI apps tidied; unnecessary reboots removed
+  * More error detection in piclone; copying of volume names and IDs added
+  * Updated translation files
+2016-05-10:
+  * New version of Scratch, which no longer requires sudo
+  * New version of BlueJ
+  * New version of NodeRED
+  * New version of pypy
+  * pigpio included
+  * geany editor included
+  * SD Card Copier added (can be used to duplicate or back up the Pi)
+  * Bluetooth plugin added to taskbar
+  * Volume control on taskbar now compatible with Bluetooth devices
+  * New shutdown helper application
+  * Mouse double-click speed setting added to mouse and keyboard preference application
+  * Option to enable / disable 1-wire interface and remote access to pigpio added to Raspberry Pi config application
+  * File system automatically expanded on first boot
+  * Empty Wastebasket option added to right-click menu 
+  * Ctrl-Alt-T can be used to open a terminal window
+  * Various small bug fixes and appearance tweaks 
+  * Updated firmware and kernel (https://github.com/raspberrypi/firmware/commit/cc6d7bf8b4c03a2a660ff9fdf4083fc165620866)
+2016-03-18:
+  * updated firmware and kernel (https://github.com/raspberrypi/firmware/commit/951799bbcd795ddf27769d14acf4813fdcbe53dc)
+  * use serial0 in cmdline.txt
+  * wpa_supplicant.conf country default to GB (allows use of channels 12 and 13)
+2016-02-26:
+  * Support added for Pi 3, including Wifi and Bluetooth
+  * Option to set wifi country code added to raspi-config
+2016-02-09:
+  * dtb that uses mmc sdcard driver (fixes problems experienced with certain SD cards)
+2016-02-03:
+  * new version of Sonic Pi (2.9)
+  * new version of Scratch (15/1/16)
+  * new version of Node-Red (2.5)
+  * new version of Wolfram (10.3)
+  * optional experimental GL desktop driver (can be enabled using advanced options in command-line raspi-config)
+  * new version of Java (1.8.0_65)
+  * new version of WiringPi
+  * raspi-gpio included
+  * ping no longer requires sudo (except NOOBS installs)
+  * support for more USB audio devices in lxpanel
+  * bug fix for creation of new menus in Alacarte
+  * various changes to raspi-config and GUI to tidy up board support and fix bugs, and updated translations
+  * small tweaks to theme to support GL driver
+2015-11-21:
+  * Included IBM Node-RED IoT application
+  * Included graphical package manager
+  * Included accelerated pixman library
+  * Updated Epiphany browser to improve video compatibility
+  * Updated Scratch with performance improvements and bug fixes
+  * Updated Raspberry Pi configuration to allow boot to pause while
+    network is established
+  * Various minor bug fixes
+2015-09-25:
+  * Based on Debian Jessie
+  * Upgraded applications - Epiphany browser, Scratch and Sonic Pi
+  * Included applications - LibreOffice, Claws Mail, Greenfoot, BlueJ
+  * Included utilities - Alacarte menu editor, Lxkeymap, scrot, tree, pip
+  * New GUI-based Raspberry Pi Configuration application
+  * GPIO control now possible without need for sudo
+  * Web link to Magpi magazine included
+  * New taskbar plugin to eject mounted USB drives
+  * Default boot is now to GUI not desktop
+  * Look and feel now based on GTK+3 default theme
+  * Print screen key launches scrot to produce screenshot
+  * Common keyboards autodetected by GUI and drivers loaded accordingly
+  * Numerous small tweaks and bugfixes
+2015-05-05:
+  * Updated UI changes
+  * Updated firmware
+  * Install raspberrypi-net-mods
+  * Install avahi-daemon
+  * Add user pi to new i2c and spi groups
+  * Modified udev rules for i2c and spi devices
+2015-02-16:
+  * Newer firmware with various fixes
+  * New Sonic Pi release
+  * Pi2 compatible RPi.GPIO
+  * Updated Wolfram Mathematica
+2015-01-31:
+  * Support for Pi2
+  * Newer firmware
+  * New Sonic Pi release
+  * Updated Scratch
+  * New Wolfram Mathematica release
+  * Updated Epiphany
+2014-12-24:
+  * Fix regression with omission of python-pygame
+2014-12-22:
+  * New firmware with variosu fixes and improvements
+  * New UI configuration for lxde
+  * Various package updates
+  * python3-pygame preinstalled
+  * 'nuscratch', scratch running on the Cog StackVM
+  * Misc other changes
+2014-09-09:
+  * New firmware with various fixes and improvements
+  * Minecraft Pi pre-installed
+  * Sonic Pi upgraded to 2.0
+  * Include Epiphany browser work from Collabora
+  * Switch to Java 8 from Java 7
+  * Updated Mathematica
+  * Misc minor configuration changes
+2014-06-20:
+  * New firmware with various fixes, and kernel bugfix
+2014-06-02:
+  * Many, many firmware updates with major USB improvements
+  * pyserial installed by default
+  * picamera installed by default
+2014-01-07:
+  * Firmware updated
+  * Some space saved on the root filesystem
+2013-12-20:
+  * Firmware updated, includes V4L2 fixes
+  * Update omxplayer
+2013-12-18:
+  * Firmware updated and now using kernel 3.10. Many, many improvements
+  * fbturbo XOrg driver is now included and enabled by default. Thanks to 
+    ssvb https://github.com/ssvb/xf86-video-fbturbo
+  * Update Scratch image with further bug fixes
+  * Include Wolfram Mathematica
+  * Update to PyPy 2.2
+  * Update omxplayer
+  * Include v4l-utils for use with experimental V4L2 Raspberry Pi camera driver
+  * Update squeak-vm to fix issues with loading JPEGs
+2013-09-25:
+  * Update Scratch image for further performance improvements
+  * Include Oracle JDK
+  * At least a 4GiB SD card is now required (see above)
+  * Include PyPy 2.1
+  * Include base piface packages
+  * Update raspi-config to include bugfix for inheriting language settings
+    from NOOBS
+2013-09-10:
+  * Updated to current top of tree firmware
+  * Update squeak-vm, including fastblit optimised for the Raspbery Pi 
+  * Include Sonic Pi and a fixed jackd2 package
+  * Support boot to Scratch
+  * Inherit keyboard and language settings from NOOBS
--- a/export-noobs/prerun.sh
+++ b/export-noobs/prerun.sh
@ -0,0 +1,36 @@
+#!/bin/bash -e
+
+IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
+NOOBS_DIR="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"
+unmount_image "${IMG_FILE}"
+
+mkdir -p "${STAGE_WORK_DIR}"
+cp "${WORK_DIR}/export-image/${IMG_FILENAME}${IMG_SUFFIX}.img" "${STAGE_WORK_DIR}/"
+
+rm -rf "${NOOBS_DIR}"
+
+PARTED_OUT=$(parted -sm "${IMG_FILE}" unit b print)
+BOOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^1:' | cut -d':' -f 2 | tr -d B)
+BOOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^1:' | cut -d':' -f 4 | tr -d B)
+
+ROOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^2:' | cut -d':' -f 2 | tr -d B)
+ROOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^2:' | cut -d':' -f 4 | tr -d B)
+
+BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}")
+ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}")
+echo "/boot: offset $BOOT_OFFSET, length $BOOT_LENGTH"
+echo "/:     offset $ROOT_OFFSET, length $ROOT_LENGTH"
+
+mkdir -p "${STAGE_WORK_DIR}/rootfs"
+mkdir -p "${NOOBS_DIR}"
+
+mount "$ROOT_DEV" "${STAGE_WORK_DIR}/rootfs"
+mount "$BOOT_DEV" "${STAGE_WORK_DIR}/rootfs/boot"
+
+ln -sv "/lib/systemd/system/apply_noobs_os_config.service" "$ROOTFS_DIR/etc/systemd/system/multi-user.target.wants/apply_noobs_os_config.service"
+
+bsdtar --numeric-owner --format gnutar -C "${STAGE_WORK_DIR}/rootfs/boot" -cpf - . | xz -T0 > "${NOOBS_DIR}/boot.tar.xz"
+umount "${STAGE_WORK_DIR}/rootfs/boot"
+bsdtar --numeric-owner --format gnutar -C "${STAGE_WORK_DIR}/rootfs" --one-file-system -cpf - . | xz -T0 > "${NOOBS_DIR}/root.tar.xz"
+
+unmount_image "${IMG_FILE}"
--- a/scripts/common
+++ b/scripts/common
@ -0,0 +1,101 @@
+log (){
+	date +"[%T] $*" | tee -a "${LOG_FILE}"
+}
+export -f log
+
+bootstrap(){
+	local BOOTSTRAP_CMD=debootstrap
+	local BOOTSTRAP_ARGS=()
+
+	export http_proxy=${APT_PROXY}
+
+	if [ "$(dpkg --print-architecture)" !=  "armhf" ] && [ "$(dpkg --print-architecture)" !=  "arm64" ]; then
+		BOOTSTRAP_CMD=qemu-debootstrap
+	fi
+
+	BOOTSTRAP_ARGS+=(--arch arm64)
+  BOOTSTRAP_ARGS+=(--include gnupg)
+	BOOTSTRAP_ARGS+=(--components "main,contrib,non-free")
+	#BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
+	BOOTSTRAP_ARGS+=("$@")
+	printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}"
+
+  capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true
+
+	if [ -d "$2/debootstrap" ]; then
+		rmdir "$2/debootstrap"
+	fi
+}
+export -f bootstrap
+
+copy_previous(){
+	if [ ! -d "${PREV_ROOTFS_DIR}" ]; then
+		echo "Previous stage rootfs not found"
+		false
+	fi
+	mkdir -p "${ROOTFS_DIR}"
+	rsync -aHAXx --exclude var/cache/apt/archives "${PREV_ROOTFS_DIR}/" "${ROOTFS_DIR}/"
+}
+export -f copy_previous
+
+unmount(){
+	if [ -z "$1" ]; then
+		DIR=$PWD
+	else
+		DIR=$1
+	fi
+
+	while mount | grep -q "$DIR"; do
+		local LOCS
+		LOCS=$(mount | grep "$DIR" | cut -f 3 -d ' ' | sort -r)
+		for loc in $LOCS; do
+			umount "$loc"
+		done
+	done
+}
+export -f unmount
+
+unmount_image(){
+	sync
+	sleep 1
+	local LOOP_DEVICES
+	LOOP_DEVICES=$(losetup --list | grep "$(basename "${1}")" | cut -f1 -d' ')
+	for LOOP_DEV in ${LOOP_DEVICES}; do
+		if [ -n "${LOOP_DEV}" ]; then
+			local MOUNTED_DIR
+			MOUNTED_DIR=$(mount | grep "$(basename "${LOOP_DEV}")" | head -n 1 | cut -f 3 -d ' ')
+			if [ -n "${MOUNTED_DIR}" ] && [ "${MOUNTED_DIR}" != "/" ]; then
+				unmount "$(dirname "${MOUNTED_DIR}")"
+			fi
+			sleep 1
+			losetup -d "${LOOP_DEV}"
+		fi
+	done
+}
+export -f unmount_image
+
+on_chroot() {
+	if ! mount | grep -q "$(realpath "${ROOTFS_DIR}"/proc)"; then
+		mount -t proc proc "${ROOTFS_DIR}/proc"
+	fi
+
+	if ! mount | grep -q "$(realpath "${ROOTFS_DIR}"/dev)"; then
+		mount --bind /dev "${ROOTFS_DIR}/dev"
+	fi
+	
+	if ! mount | grep -q "$(realpath "${ROOTFS_DIR}"/dev/pts)"; then
+		mount --bind /dev/pts "${ROOTFS_DIR}/dev/pts"
+	fi
+
+	if ! mount | grep -q "$(realpath "${ROOTFS_DIR}"/sys)"; then
+		mount --bind /sys "${ROOTFS_DIR}/sys"
+	fi
+
+	setarch linux32 capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
+}
+export -f on_chroot
+
+update_issue() {
+	echo -e "Raspberry Pi reference ${IMG_DATE}\nGenerated using ${PI_GEN}, ${PI_GEN_REPO}, ${GIT_HASH}, ${1}" > "${ROOTFS_DIR}/etc/rpi-issue"
+}
+export -f update_issue
--- a/scripts/dependencies_check
+++ b/scripts/dependencies_check
@ -0,0 +1,38 @@
+# dependencies_check
+# $@	Dependency files to check
+#
+# Each dependency is in the form of a tool to test for, optionally followed by
+# a : and the name of a package if the package on a Debian-ish system is not
+# named for the tool (i.e., qemu-user-static).
+dependencies_check()
+{
+	local depfile deps missing
+
+	for depfile in "$@"; do
+		if [[ -e "$depfile" ]]; then
+			deps="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${BASE_DIR}/depends")"
+
+		fi
+		for dep in $deps; do
+			if ! hash "${dep%:*}" 2>/dev/null; then
+				missing="${missing:+$missing }${dep#*:}"
+			fi
+		done
+	done
+
+	if [[ "$missing" ]]; then
+		echo "Required dependencies not installed"
+		echo
+		echo "This can be resolved on Debian/Raspbian systems by installing:"
+		echo "$missing"
+		false
+	fi
+
+
+	if ! grep -q "/proc/sys/fs/binfmt_misc" /proc/mounts; then
+		echo "Module binfmt_misc not loaded in host"
+		echo "Please run:"
+		echo "  sudo modprobe binfmt_misc"
+		exit 1
+	fi
+}
--- a/scripts/remove-comments.sed
+++ b/scripts/remove-comments.sed
@ -0,0 +1,11 @@
+# Deletes comments and collapses whitespace in ##-packages files
+
+# Append (N)ext line to buffer
+# if (!)not ($)buffer is EOF, (b)ranch to (:)label loop
+:loop
+N
+$ !b loop
+
+# Buffer is "line1\nline2\n...lineN", del comments and collapse whitespace
+s/#[^\n]*//g
+s/[[:space:]]\{1,\}/ /g
--- a/stage0/00-configure-apt/00-run.sh
+++ b/stage0/00-configure-apt/00-run.sh
@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+install -m 644 files/sources.list "${ROOTFS_DIR}/etc/apt/"
+install -m 644 files/raspi.list "${ROOTFS_DIR}/etc/apt/sources.list.d/"
+sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list"
+sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/raspi.list"
+
+if [ -n "$APT_PROXY" ]; then
+	install -m 644 files/51cache "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
+	sed "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache" -i -e "s|APT_PROXY|${APT_PROXY}|"
+else
+	rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
+fi
+
+on_chroot apt-key add - < files/raspberrypi.gpg.key
+on_chroot << EOF
+dpkg --add-architecture armhf
+apt-get update
+apt-get dist-upgrade -y
+EOF
--- a/stage0/00-configure-apt/files/51cache
+++ b/stage0/00-configure-apt/files/51cache
@ -0,0 +1 @@
+Acquire::http { Proxy "APT_PROXY"; };
--- a/stage0/00-configure-apt/files/raspberrypi.gpg.key
+++ b/stage0/00-configure-apt/files/raspberrypi.gpg.key
@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+mQENBE/d7o8BCACrwqQacGJfn3tnMzGui6mv2lLxYbsOuy/+U4rqMmGEuo3h9m92
+30E2EtypsoWczkBretzLUCFv+VUOxaA6sV9+puTqYGhhQZFuKUWcG7orf7QbZRuu
+TxsEUepW5lg7MExmAu1JJzqM0kMQX8fVyWVDkjchZ/is4q3BPOUCJbUJOsE+kK/6
+8kW6nWdhwSAjfDh06bA5wvoXNjYoDdnSZyVdcYCPEJXEg5jfF/+nmiFKMZBraHwn
+eQsepr7rBXxNcEvDlSOPal11fg90KXpy7Umre1UcAZYJdQeWcHu7X5uoJx/MG5J8
+ic6CwYmDaShIFa92f8qmFcna05+lppk76fsnABEBAAG0IFJhc3BiZXJyeSBQaSBB
+cmNoaXZlIFNpZ25pbmcgS2V5iQE4BBMBAgAiBQJP3e6PAhsDBgsJCAcDAgYVCAIJ
+CgsEFgIDAQIeAQIXgAAKCRCCsSmSf6MwPk6vB/9pePB3IukU9WC9Bammh3mpQTvL
+OifbkzHkmAYxzjfK6D2I8pT0xMxy949+ThzJ7uL60p6T/32ED9DR3LHIMXZvKtuc
+mQnSiNDX03E2p7lIP/htoxW2hDP2n8cdlNdt0M9IjaWBppsbO7IrDppG2B1aRLni
+uD7v8bHRL2mKTtIDLX42Enl8aLAkJYgNWpZyPkDyOqamjijarIWjGEPCkaURF7g4
+d44HvYhpbLMOrz1m6N5Bzoa5+nq3lmifeiWKxioFXU+Hy5bhtAM6ljVb59hbD2ra
+X4+3LXC9oox2flmQnyqwoyfZqVgSQa0B41qEQo8t1bz6Q1Ti7fbMLThmbRHiuQEN
+BE/d7o8BCADNlVtBZU63fm79SjHh5AEKFs0C3kwa0mOhp9oas/haDggmhiXdzeD3
+49JWz9ZTx+vlTq0s+I+nIR1a+q+GL+hxYt4HhxoA6vlDMegVfvZKzqTX9Nr2VqQa
+S4Kz3W5ULv81tw3WowK6i0L7pqDmvDqgm73mMbbxfHD0SyTt8+fk7qX6Ag2pZ4a9
+ZdJGxvASkh0McGpbYJhk1WYD+eh4fqH3IaeJi6xtNoRdc5YXuzILnp+KaJyPE5CR
+qUY5JibOD3qR7zDjP0ueP93jLqmoKltCdN5+yYEExtSwz5lXniiYOJp8LWFCgv5h
+m8aYXkcJS1xVV9Ltno23YvX5edw9QY4hABEBAAGJAR8EGAECAAkFAk/d7o8CGwwA
+CgkQgrEpkn+jMD5Figf/dIC1qtDMTbu5IsI5uZPX63xydaExQNYf98cq5H2fWF6O
+yVR7ERzA2w33hI0yZQrqO6pU9SRnHRxCFvGv6y+mXXXMRcmjZG7GiD6tQWeN/3wb
+EbAn5cg6CJ/Lk/BI4iRRfBX07LbYULCohlGkwBOkRo10T+Ld4vCCnBftCh5x2OtZ
+TOWRULxP36y2PLGVNF+q9pho98qx+RIxvpofQM/842ZycjPJvzgVQsW4LT91KYAE
+4TVf6JjwUM6HZDoiNcX6d7zOhNfQihXTsniZZ6rky287htsWVDNkqOi5T3oTxWUo
+m++/7s3K3L0zWopdhMVcgg6Nt9gcjzqN1c0gy55L/g==
+=mNSj
+-----END PGP PUBLIC KEY BLOCK-----
--- a/stage0/00-configure-apt/files/raspi.list
+++ b/stage0/00-configure-apt/files/raspi.list
@ -0,0 +1,3 @@
+deb http://archive.raspberrypi.org/debian/ RELEASE main
+# Uncomment line below then 'apt-get update' to enable 'apt-get source'
+#deb-src http://archive.raspberrypi.org/debian/ RELEASE main
--- a/stage0/00-configure-apt/files/sources.list
+++ b/stage0/00-configure-apt/files/sources.list
@ -0,0 +1,7 @@
+deb http://deb.debian.org/debian RELEASE main contrib non-free
+deb http://deb.debian.org/debian-security/ RELEASE/updates main contrib non-free
+deb http://deb.debian.org/debian RELEASE-updates main contrib non-free
+# Uncomment deb-src lines below then 'apt-get update' to enable 'apt-get source'
+#deb-src http://deb.debian.org/debian RELEASE main contrib non-free
+#deb-src http://deb.debian.org/debian-security/ RELEASE/updates main contrib non-free
+#deb-src http://deb.debian.org/debian RELEASE-updates main contrib non-free
--- a/stage0/01-locale/00-debconf
+++ b/stage0/01-locale/00-debconf
--- a/stage0/01-locale/00-packages
+++ b/stage0/01-locale/00-packages
@ -0,0 +1 @@
+locales
--- a/stage0/02-firmware/01-packages
+++ b/stage0/02-firmware/01-packages
@ -0,0 +1,2 @@
+raspberrypi-bootloader
+raspberrypi-kernel
--- a/stage0/files/raspberrypi.gpg
+++ b/stage0/files/raspberrypi.gpg
--- a/stage0/prerun.sh
+++ b/stage0/prerun.sh
@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
+  bootstrap ${RELEASE} "${ROOTFS_DIR}" http://deb.debian.org/debian/
+fi
--- a/stage1/00-boot-files/00-run.sh
+++ b/stage1/00-boot-files/00-run.sh
@ -0,0 +1,4 @@
+#!/bin/bash -e
+
+install -m 644 files/cmdline.txt "${ROOTFS_DIR}/boot/"
+install -m 644 files/config.txt "${ROOTFS_DIR}/boot/"
--- a/stage1/00-boot-files/files/cmdline.txt
+++ b/stage1/00-boot-files/files/cmdline.txt
@ -0,0 +1 @@
+console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
--- a/stage1/00-boot-files/files/config.txt
+++ b/stage1/00-boot-files/files/config.txt
@ -0,0 +1,68 @@
+# For more options and information see
+# http://rpf.io/configtxt
+# Some settings may impact device functionality. See link above for details
+
+# uncomment if you get no picture on HDMI for a default "safe" mode
+#hdmi_safe=1
+
+# uncomment this if your display has a black border of unused pixels visible
+# and your display can output without overscan
+disable_overscan=1
+
+# uncomment the following to adjust overscan. Use positive numbers if console
+# goes off screen, and negative if there is too much border
+#overscan_left=16
+#overscan_right=16
+#overscan_top=16
+#overscan_bottom=16
+
+# uncomment to force a console size. By default it will be display's size minus
+# overscan.
+#framebuffer_width=1280
+#framebuffer_height=720
+
+# uncomment if hdmi display is not detected and composite is being output
+#hdmi_force_hotplug=1
+
+# uncomment to force a specific HDMI mode (this will force VGA)
+#hdmi_group=1
+#hdmi_mode=1
+
+# uncomment to force a HDMI mode rather than DVI. This can make audio work in
+# DMT (computer monitor) modes
+#hdmi_drive=2
+
+# uncomment to increase signal to HDMI, if you have interference, blanking, or
+# no display
+#config_hdmi_boost=4
+
+# uncomment for composite PAL
+#sdtv_mode=2
+
+#uncomment to overclock the arm. 700 MHz is the default.
+#arm_freq=800
+
+# Uncomment some or all of these to enable the optional hardware interfaces
+#dtparam=i2c_arm=on
+#dtparam=i2s=on
+#dtparam=spi=on
+
+# Uncomment this to enable infrared communication.
+#dtoverlay=gpio-ir,gpio_pin=17
+#dtoverlay=gpio-ir-tx,gpio_pin=18
+
+# Additional overlays and parameters are documented /boot/overlays/README
+
+# Enable audio (loads snd_bcm2835)
+dtparam=audio=on
+
+# Memory split
+gpu_mem=128
+
+# Enable DRM VC4 V3D driver
+dtoverlay=vc4-kms-v3d
+max_framebuffers=2
+
+[all]
+#dtoverlay=vc4-fkms-v3d
+arm_64bit=1
--- a/stage1/01-sys-tweaks/00-patches/01-bashrc.diff
+++ b/stage1/01-sys-tweaks/00-patches/01-bashrc.diff
@ -0,0 +1,33 @@
+--- a/rootfs/etc/skel/.bashrc
+++ b/rootfs/etc/skel/.bashrc
+@@ -43,7 +43,7 @@
+ # uncomment for a colored prompt, if the terminal has the capability; turned
+ # off by default to not distract the user: the focus in a terminal window
+ # should be on the output of commands, not on the prompt
+-#force_color_prompt=yes
+force_color_prompt=yes
+ 
+ if [ -n "$force_color_prompt" ]; then
+     if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+@@ -57,7 +57,7 @@
+ fi
+ 
+ if [ "$color_prompt" = yes ]; then
+-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w \$\[\033[00m\] '
+ else
+     PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+ fi
+@@ -79,9 +79,9 @@
+     #alias dir='dir --color=auto'
+     #alias vdir='vdir --color=auto'
+ 
+-    #alias grep='grep --color=auto'
+-    #alias fgrep='fgrep --color=auto'
+-    #alias egrep='egrep --color=auto'
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+ fi
+ 
+ # colored GCC warnings and errors
--- a/stage1/01-sys-tweaks/00-patches/series
+++ b/stage1/01-sys-tweaks/00-patches/series
@ -0,0 +1 @@
+01-bashrc.diff
--- a/stage1/01-sys-tweaks/00-run.sh
+++ b/stage1/01-sys-tweaks/00-run.sh
@ -0,0 +1,23 @@
+#!/bin/bash -e
+
+install -d "${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d"
+install -m 644 files/noclear.conf "${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d/noclear.conf"
+install -v -m 644 files/fstab "${ROOTFS_DIR}/etc/fstab"
+install -m 755 files/.xprofile "${ROOTFS_DIR}/etc/skel/.xprofile"
+install -m 755 files/.browser.sh "${ROOTFS_DIR}/etc/skel/.browser.sh"
+install -m 644 files/.dialogrc "${ROOTFS_DIR}/etc/skel/.dialogrc"
+install -m 644 files/.dialogrc "${ROOTFS_DIR}/root/.dialogrc"
+mkdir -p "${ROOTFS_DIR}/etc/skel/.config/openbox"
+install -m 644 files/autostart "${ROOTFS_DIR}/etc/skel/.config/openbox/autostart"
+
+on_chroot << EOF
+if ! id -u ${FIRST_USER_NAME} >/dev/null 2>&1; then
+	adduser --disabled-password --gecos "" ${FIRST_USER_NAME}
+fi
+if ! id -u octoprint >/dev/null 2>&1; then
+  adduser --system --shell /usr/sbin/nologin --group --disabled-password --gecos "" octoprint
+fi
+echo "${FIRST_USER_NAME}:${FIRST_USER_PASS}" | chpasswd
+echo "octoprint:$(cat /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c40)" | chpasswd 
+echo "root:$(cat /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c40)" | chpasswd
+EOF
--- a/stage1/01-sys-tweaks/files/.browser.sh
+++ b/stage1/01-sys-tweaks/files/.browser.sh
@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Grabs the port (and IP) out of the nginx config
+LISTEN=$(grep -i listen /etc/nginx/listen.conf | awk '{gsub(";",""); print $2}')
+
+# If the value we just grabbed doesn't contain an IP, prepend localhost
+if ! echo $LISTEN | grep ":" 2>&1; then
+  ADDRESS="localhost:$LISTEN"
+else
+  ADDRESS=$LISTEN
+fi
+
+# Override the automatically detected address if the user wants to
+if [[ -f ~/.overrideurl.sh ]]; then source ~/.overrideurl.sh; fi
+
+# Wait until OctoPrint comes up
+while ! curl "$ADDRESS" 2>&1 >/dev/null; do
+  sleep 1
+done
+
+######
+## Opens browser
+# -t | Disables strict TLS check
+# -F | Fullscreen
+# -g | Disable giving away geolocation
+# -K | Enable kiosk mode (doesn't seem to do anything?)
+# -n | Disable web inspector
+# -p | Disable plugins
+surf -t -F -g -K -n -p "https://$ADDRESS"
--- a/stage1/01-sys-tweaks/files/.dialogrc
+++ b/stage1/01-sys-tweaks/files/.dialogrc
@ -0,0 +1 @@
+screen_color = (CYAN,BLACK,ON)
--- a/stage1/01-sys-tweaks/files/.xprofile
+++ b/stage1/01-sys-tweaks/files/.xprofile
@ -0,0 +1,2 @@
+[ -f ~/.xtimeout ] && . ~/.xtimeout
+exec openbox-session
--- a/stage1/01-sys-tweaks/files/autostart
+++ b/stage1/01-sys-tweaks/files/autostart
@ -0,0 +1 @@
+bash ~/.browser.sh &
--- a/stage1/01-sys-tweaks/files/fstab
+++ b/stage1/01-sys-tweaks/files/fstab
@ -0,0 +1,3 @@
+proc            /proc           proc    defaults          0       0
+BOOTDEV  /boot           vfat    defaults          0       2
+ROOTDEV  /               ext4    defaults,noatime  0       1
--- a/stage1/01-sys-tweaks/files/noclear.conf
+++ b/stage1/01-sys-tweaks/files/noclear.conf
@ -0,0 +1,2 @@
+[Service]
+TTYVTDisallocate=no
--- a/stage1/02-net-tweaks/00-packages
+++ b/stage1/02-net-tweaks/00-packages
@ -0,0 +1 @@
+netbase
--- a/stage1/02-net-tweaks/00-run.sh
+++ b/stage1/02-net-tweaks/00-run.sh
@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+echo "${TARGET_HOSTNAME}" > "${ROOTFS_DIR}/etc/hostname"
+echo "127.0.1.1		${TARGET_HOSTNAME}" >> "${ROOTFS_DIR}/etc/hosts"
+
+ln -sf /dev/null "${ROOTFS_DIR}/etc/systemd/network/99-default.link"
--- a/stage1/03-install-packages/00-packages
+++ b/stage1/03-install-packages/00-packages
@ -0,0 +1 @@
+libraspberrypi-bin libraspberrypi0 raspi-config
--- a/stage1/prerun.sh
+++ b/stage1/prerun.sh
@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
+	copy_previous
+fi
--- a/stage2/01-sys-tweaks/00-debconf
+++ b/stage2/01-sys-tweaks/00-debconf
--- a/stage2/01-sys-tweaks/00-packages
+++ b/stage2/01-sys-tweaks/00-packages
@ -0,0 +1,54 @@
+ssh
+less
+fbset
+sudo
+psmisc
+strace
+ed
+ncdu
+crda
+console-setup
+keyboard-configuration
+debconf-utils
+parted
+unzip
+build-essential
+manpages-dev
+python
+bash-completion
+gdb
+pkg-config
+python-rpi.gpio
+v4l-utils
+avahi-daemon
+hardlink
+ca-certificates
+curl
+fake-hwclock
+nfs-common
+usbutils
+libraspberrypi-dev
+libfreetype6-dev
+dosfstools
+raspberrypi-sys-mods
+pi-bluetooth
+apt-listchanges
+usb-modeswitch
+libpam-chksshpwd
+rpi-update
+libmtp-runtime
+rsync
+htop
+man-db
+policykit-1
+ssh-import-id
+rng-tools
+ethtool
+vl805fw
+ntfs-3g
+pciutils
+rpi-eeprom
+raspinfo
+unattended-upgrades
+apt-listchanges
+dialog
--- a/stage2/01-sys-tweaks/00-packages-nr
+++ b/stage2/01-sys-tweaks/00-packages-nr
@ -0,0 +1 @@
+cifs-utils
--- a/stage2/01-sys-tweaks/00-patches/01-useradd.diff
+++ b/stage2/01-sys-tweaks/00-patches/01-useradd.diff
@ -0,0 +1,22 @@
+Index: jessie-stage2/rootfs/etc/default/useradd
+===================================================================
+--- jessie-stage2.orig/rootfs/etc/default/useradd
+++ jessie-stage2/rootfs/etc/default/useradd
+@@ -5,7 +5,7 @@
+ # Similar to DHSELL in adduser. However, we use "sh" here because
+ # useradd is a low level utility and should be as general
+ # as possible
+-SHELL=/bin/sh
+SHELL=/bin/bash
+ #
+ # The default group for users
+ # 100=users on Debian systems
+@@ -29,7 +29,7 @@ SHELL=/bin/sh
+ # The SKEL variable specifies the directory containing "skeletal" user
+ # files; in other words, files such as a sample .profile that will be
+ # copied to the new user's home directory when it is created.
+-# SKEL=/etc/skel
+SKEL=/etc/skel
+ #
+ # Defines whether the mail spool should be created while
+ # creating the account
--- a/stage2/01-sys-tweaks/00-patches/04-inputrc.diff
+++ b/stage2/01-sys-tweaks/00-patches/04-inputrc.diff
@ -0,0 +1,12 @@
+Index: jessie-stage2/rootfs/etc/inputrc
+===================================================================
+--- jessie-stage2.orig/rootfs/etc/inputrc
+++ jessie-stage2/rootfs/etc/inputrc
+@@ -65,3 +65,7 @@ $endif
+ # "\e[F": end-of-line
+ 
+ $endif
+
+# mappings for up and down arrows search history
+# "\e[B": history-search-forward
+# "\e[A": history-search-backward
--- a/stage2/01-sys-tweaks/00-patches/05-path.diff
+++ b/stage2/01-sys-tweaks/00-patches/05-path.diff
@ -0,0 +1,26 @@
+Index: jessie-stage2/rootfs/etc/login.defs
+===================================================================
+--- jessie-stage2.orig/rootfs/etc/login.defs
+++ jessie-stage2/rootfs/etc/login.defs
+@@ -100,7 +100,7 @@ HUSHLOGIN_FILE	.hushlogin
+ #
+ # (they are minimal, add the rest in the shell startup files)
+ ENV_SUPATH	PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+-ENV_PATH	PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
+ENV_PATH        PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/games:/usr/games
+ 
+ #
+ # Terminal permissions
+Index: jessie-stage2/rootfs/etc/profile
+===================================================================
+--- jessie-stage2.orig/rootfs/etc/profile
+++ jessie-stage2/rootfs/etc/profile
+@@ -4,7 +4,7 @@
+ if [ "`id -u`" -eq 0 ]; then
+   PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ else
+-  PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
+  PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/games:/usr/games"
+ fi
+ export PATH
+ 
--- a/stage2/01-sys-tweaks/00-patches/07-resize-init.diff
+++ b/stage2/01-sys-tweaks/00-patches/07-resize-init.diff
@ -0,0 +1,5 @@
+--- stage2.orig/rootfs/boot/cmdline.txt
+++ stage2/rootfs/boot/cmdline.txt
+@@ -1 +1 @@
+-console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
+console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh
--- a/stage2/01-sys-tweaks/00-patches/series
+++ b/stage2/01-sys-tweaks/00-patches/series
@ -0,0 +1,4 @@
+01-useradd.diff
+04-inputrc.diff
+05-path.diff
+07-resize-init.diff
--- a/stage2/01-sys-tweaks/01-run.sh
+++ b/stage2/01-sys-tweaks/01-run.sh
@ -0,0 +1,67 @@
+#!/bin/bash -e
+
+install -m 755 files/resize2fs_once	"${ROOTFS_DIR}/etc/init.d/"
+
+install -d				"${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d"
+install -m 644 files/ttyoutput.conf	"${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d/"
+
+install -m 644 files/50raspi		"${ROOTFS_DIR}/etc/apt/apt.conf.d/"
+
+install -m 644 files/console-setup   	"${ROOTFS_DIR}/etc/default/"
+
+install -m 755 files/rc.local		"${ROOTFS_DIR}/etc/"
+
+on_chroot << EOF
+systemctl disable hwclock.sh
+systemctl disable nfs-common
+systemctl disable rpcbind
+if [ "${ENABLE_SSH}" == "1" ]; then
+	systemctl enable ssh
+else
+	systemctl disable ssh
+fi
+systemctl enable regenerate_ssh_host_keys
+EOF
+
+if [ "${USE_QEMU}" = "1" ]; then
+	echo "enter QEMU mode"
+	install -m 644 files/90-qemu.rules "${ROOTFS_DIR}/etc/udev/rules.d/"
+	on_chroot << EOF
+systemctl disable resize2fs_once
+EOF
+	echo "leaving QEMU mode"
+else
+	on_chroot << EOF
+systemctl enable resize2fs_once
+EOF
+fi
+
+on_chroot <<EOF
+for GRP in input spi i2c gpio; do
+	groupadd -f -r "\$GRP"
+done
+for GRP in adm cdrom audio users sudo video games plugdev input gpio spi i2c netdev; do
+  adduser $FIRST_USER_NAME \$GRP
+done
+for GRP in dialout plugdev video users; do
+  adduser octoprint \$GRP
+done
+EOF
+
+on_chroot << EOF
+setupcon --force --save-only -v
+EOF
+
+on_chroot << EOF
+usermod --pass='*' root
+EOF
+
+rm -f "${ROOTFS_DIR}/etc/ssh/"ssh_host_*_key*
+
+rm -f "${ROOTFS_DIR}/etc/sudoers.d/010_pi-nopasswd" # Fuck you :)
+echo "%sudo ALL=(ALL:ALL) ALL" > ${ROOTFS_DIR}/etc/sudoers.d/group
+
+on_chroot << EOF
+echo unattended-upgrades unattended-upgrades/enable_auto_updates boolean true | debconf-set-selections
+dpkg-reconfigure -f noninteractive unattended-upgrades
+EOF
--- a/stage2/01-sys-tweaks/files/50raspi
+++ b/stage2/01-sys-tweaks/files/50raspi
@ -0,0 +1,5 @@
+# never use pdiffs. Current implementation is very slow on low-powered devices
+Acquire::PDiffs "0";
+
+# download up to 5 pdiffs:
+#Acquire::PDiffs::FileLimit "5";
--- a/stage2/01-sys-tweaks/files/90-qemu.rules
+++ b/stage2/01-sys-tweaks/files/90-qemu.rules
@ -0,0 +1,3 @@
+KERNEL=="sda", SYMLINK+="mmcblk0"
+KERNEL=="sda?", SYMLINK+="mmcblk0p%n"
+KERNEL=="sda2", SYMLINK+="root"
--- a/stage2/01-sys-tweaks/files/console-setup
+++ b/stage2/01-sys-tweaks/files/console-setup
@ -0,0 +1,16 @@
+# CONFIGURATION FILE FOR SETUPCON
+
+# Consult the console-setup(5) manual page.
+
+ACTIVE_CONSOLES="/dev/tty[1-6]"
+
+CHARMAP="UTF-8"
+
+CODESET="guess"
+FONTFACE=""
+FONTSIZE=""
+
+VIDEOMODE=
+
+# The following is an example how to use a braille font
+# FONT='lat9w-08.psf.gz brl-8x8.psf'
--- a/stage2/01-sys-tweaks/files/rc.local
+++ b/stage2/01-sys-tweaks/files/rc.local
@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+# Print the IP address
+_IP=$(hostname -I) || true
+if [ "$_IP" ]; then
+  printf "My IP address is %s\n" "$_IP"
+fi
+
+exit 0
--- a/stage2/01-sys-tweaks/files/resize2fs_once
+++ b/stage2/01-sys-tweaks/files/resize2fs_once
@ -0,0 +1,25 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          resize2fs_once
+# Required-Start:
+# Required-Stop:
+# Default-Start: 3
+# Default-Stop:
+# Short-Description: Resize the root filesystem to fill partition
+# Description:
+### END INIT INFO
+. /lib/lsb/init-functions
+case "$1" in
+  start)
+    log_daemon_msg "Starting resize2fs_once"
+    ROOT_DEV=$(findmnt / -o source -n) &&
+    resize2fs $ROOT_DEV &&
+    update-rc.d resize2fs_once remove &&
+    rm /etc/init.d/resize2fs_once &&
+    log_end_msg $?
+    ;;
+  *)
+    echo "Usage: $0 start" >&2
+    exit 3
+    ;;
+esac
--- a/stage2/01-sys-tweaks/files/ttyoutput.conf
+++ b/stage2/01-sys-tweaks/files/ttyoutput.conf
@ -0,0 +1,2 @@
+[Service]
+StandardOutput=tty
--- a/stage2/02-net-tweaks/00-packages
+++ b/stage2/02-net-tweaks/00-packages
@ -0,0 +1,9 @@
+wpasupplicant
+wireless-tools
+firmware-atheros
+firmware-brcm80211
+firmware-libertas
+firmware-misc-nonfree
+firmware-realtek
+net-tools
+network-manager
--- a/stage2/02-net-tweaks/01-run.sh
+++ b/stage2/02-net-tweaks/01-run.sh
@ -0,0 +1,31 @@
+#!/bin/bash -e
+
+#install -v -d					"${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d"
+#install -v -m 644 files/wait.conf		"${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/"
+
+install -v -d					"${ROOTFS_DIR}/etc/wpa_supplicant"
+install -v -m 600 files/wpa_supplicant.conf	"${ROOTFS_DIR}/etc/wpa_supplicant/"
+
+if [ -v WPA_COUNTRY ]; then
+	echo "country=${WPA_COUNTRY}" >> "${ROOTFS_DIR}/etc/wpa_supplicant/wpa_supplicant.conf"
+fi
+
+if [ -v WPA_ESSID ] && [ -v WPA_PASSWORD ]; then
+on_chroot <<EOF
+set -o pipefail
+wpa_passphrase "${WPA_ESSID}" "${WPA_PASSWORD}" | tee -a "/etc/wpa_supplicant/wpa_supplicant.conf"
+EOF
+elif [ -v WPA_ESSID ]; then
+cat >> "${ROOTFS_DIR}/etc/wpa_supplicant/wpa_supplicant.conf" << EOL
+
+network={
+	ssid="${WPA_ESSID}"
+	key_mgmt=NONE
+}
+EOL
+fi
+
+# Disable wifi on 5GHz models
+mkdir -p "${ROOTFS_DIR}/var/lib/systemd/rfkill/"
+echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-3f300000.mmcnr:wlan"
+echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-fe300000.mmcnr:wlan"
--- a/stage2/02-net-tweaks/files/wait.conf
+++ b/stage2/02-net-tweaks/files/wait.conf
@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=/usr/lib/dhcpcd5/dhcpcd -q -w
--- a/stage2/02-net-tweaks/files/wpa_supplicant.conf
+++ b/stage2/02-net-tweaks/files/wpa_supplicant.conf
@ -0,0 +1,2 @@
+ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
+update_config=1
--- a/stage2/03-set-timezone/02-run.sh
+++ b/stage2/03-set-timezone/02-run.sh
@ -0,0 +1,8 @@
+#!/bin/bash -e
+
+echo "${TIMEZONE_DEFAULT}" > "${ROOTFS_DIR}/etc/timezone"
+rm "${ROOTFS_DIR}/etc/localtime"
+
+on_chroot << EOF
+dpkg-reconfigure -f noninteractive tzdata
+EOF
--- a/stage2/04-octoprint/00-packages
+++ b/stage2/04-octoprint/00-packages
@ -0,0 +1,8 @@
+python-pip
+python-dev
+python-setuptools
+python-virtualenv
+git
+libyaml-dev
+nginx
+ffmpeg 
--- a/stage2/04-octoprint/01-run.sh
+++ b/stage2/04-octoprint/01-run.sh
@ -0,0 +1,23 @@
+#!/bin/bash -e
+
+install -m 644 files/octoprint.service ${ROOTFS_DIR}/etc/systemd/system/octoprint.service
+
+install -m 644 files/nginx.conf ${ROOTFS_DIR}/etc/nginx/nginx.conf
+echo -e "listen 443;" > ${ROOTFS_DIR}/etc/nginx/listen.conf
+
+on_chroot << EOF
+# Package enables this when installed, won't start until first-time is run due to missing SSL certs
+systemctl disable nginx 
+# If OctoPrint already exists, skip this (for debugging)
+if [[ ! -f /srv/octoprint/bin/octoprint ]]; then
+  cd /srv/ || exit 1
+  virtualenv octoprint || exit 1
+  source octoprint/bin/activate || exit 1
+  pip install pip --upgrade 
+  pip install octoprint || exit 1
+  # Fix permissions
+  chown -R octoprint:octoprint /srv/octoprint
+fi
+# Enable the reverse proxy
+systemctl enable nginx
+EOF
--- a/stage2/04-octoprint/files/nginx.conf
+++ b/stage2/04-octoprint/files/nginx.conf
@ -0,0 +1,57 @@
+    worker_processes auto;
+    
+    events {
+        worker_connections  1024;
+    }
+    
+    http {
+        include            mime.types;
+        default_type       application/octet-stream;
+        sendfile           on;
+        keepalive_timeout  65;
+
+        map $http_upgrade $connection_upgrade {
+            default upgrade;
+            '' close;
+        }
+  
+        upstream "octoprint" {
+            server 127.0.0.1:5000;
+        }
+    
+        upstream "mjpg-streamer" {
+            server 127.0.0.1:8080;
+        }
+
+        server {
+            include /etc/nginx/listen.conf;
+            ssl on;
+            ssl_certificate /etc/ssl/certs/nginx-octoprint.crt;
+            ssl_certificate_key /etc/ssl/private/nginx-octoprint.key;
+            add_header Strict-Transport-Security "max-age=63072000; includeSubdomains"; 
+            server_name  localhost;
+            
+            location / {
+                proxy_pass http://octoprint/;
+                proxy_set_header Host $host;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "upgrade";
+                proxy_set_header X-Real-IP $remote_addr;
+                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+                proxy_set_header X-Scheme $scheme;
+                proxy_http_version 1.1;
+
+                client_max_body_size 0;    
+            }
+
+            location /webcam/ {
+                proxy_pass http://mjpg-streamer/;
+            }
+
+            # redirect server error pages to the static page /50x.html
+            error_page   500 502 503 504  /50x.html;
+            location = /50x.html {
+                root   html;
+            }
+        }
+    } 
--- a/stage2/04-octoprint/files/octoprint.service
+++ b/stage2/04-octoprint/files/octoprint.service
@ -0,0 +1,13 @@
+[Unit]
+Description=OctoPrint Daemon
+Wants=nginx.service
+
+[Service]
+Type=simple
+User=octoprint
+Group=octoprint
+ExecStart=/srv/octoprint/bin/octoprint --host localhost --port 5000
+
+[Install]
+WantedBy=multi-user.target
+ 
--- a/stage2/05-mjpgstreamer/00-packages
+++ b/stage2/05-mjpgstreamer/00-packages
@ -0,0 +1,6 @@
+cmake
+libjpeg-dev
+v4l-utils
+libv4l-dev
+gcc
+g++
--- a/stage2/05-mjpgstreamer/01-run.sh
+++ b/stage2/05-mjpgstreamer/01-run.sh
@ -0,0 +1,25 @@
+#!/bin/bash -e
+
+install -m 644 files/mjpg-streamer.service ${ROOTFS_DIR}/etc/systemd/system/mjpg-streamer.service
+install -m 755 files/start-mjpg ${ROOTFS_DIR}/usr/local/bin/start-mjpg
+
+on_chroot << EOF
+# If mjpg is already installed, skip this (for debugging)
+if ! which mjpg_streamer; then
+  cd /tmp
+  # Making sure that this directory doesn't exist
+  rm -rf /tmp/mjpg-streamer
+  git clone https://github.com/jacksonliam/mjpg-streamer/
+  cd mjpg-streamer/mjpg-streamer-experimental/
+  make
+  make install
+  cd /
+  # Cleanup
+  rm -rf /tmp/mjpg-streamer
+  # Create needed folder
+  mkdir -p /var/www/mjpg
+  # Permissions
+  chown octoprint:octoprint /var/www/mjpg
+fi
+EOF
+ 
--- a/stage2/05-mjpgstreamer/files/mjpg-streamer.service
+++ b/stage2/05-mjpgstreamer/files/mjpg-streamer.service
@ -0,0 +1,13 @@
+[Unit]
+Description=MJPG-Streamer Daemon
+Wants=nginx.service
+
+[Service]
+Type=simple
+User=octoprint
+Group=octoprint
+ExecStart=/usr/local/bin/start-mjpg 
+
+[Install]
+WantedBy=multi-user.target
+ 
--- a/stage2/05-mjpgstreamer/files/start-mjpg
+++ b/stage2/05-mjpgstreamer/files/start-mjpg
@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/local/bin/mjpg_streamer -i input_uvc.so -o "output_http.so --port 8080 -w /var/www/mjpg" 
--- a/stage2/06-utils/00-run.sh
+++ b/stage2/06-utils/00-run.sh
@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+mkdir -p "${ROOTFS_DIR}/usr/local/bin/"
+install -m 755 files/octo-config "${ROOTFS_DIR}/usr/local/bin/octo-config"
+install -m 755 files/first-time.sh "${ROOTFS_DIR}/etc/profile.d/first-time.sh"
+install -m 755 files/octo-lib.sh "${ROOTFS_DIR}/usr/local/lib/octo-lib.sh"
+
+# Autologin on first boot
+mkdir -p ${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d/ 
+cat > ${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d/override.conf << 'EOF'
+[Service]
+ExecStart=
+ExecStart=-/usr/sbin/agetty --autologin root --noclear %I $TERM
+EOF
+
+# Don't boot to a GUI
+on_chroot << EOF
+systemctl set-default multi-user.target
+EOF
--- a/stage2/06-utils/files/first-time.sh
+++ b/stage2/06-utils/files/first-time.sh
@ -0,0 +1,106 @@
+#!/bin/bash
+
+# This should never happen, no harm in checking though ;)
+if [ "$EUID" -ne 0 ]; then 
+  echo "This image has not been configured properly. Please complain to Logan"
+  bash
+  exit 1
+fi
+
+# Import common functions
+source /usr/local/lib/octo-lib.sh
+
+install_package () {
+  echo "==========Installing $1==========" >>/home/pi/install.log 
+  source /srv/octoprint/bin/activate || return 1
+  pip install $1 2>&1 >>/home/pi/install.log || return 1
+}
+
+error_install () {
+  dialog --title "ERROR" --msgbox "Error installing $1!" 10 50
+}
+
+recommended_menu () {
+  local RECOMMEND_MENU=$(dialog --nocancel --title "Plugin Manager | Recommended Plugins" --checklist "Check plugins that you wish to install" 0 0 0 \
+  "OctoPrint-Dashboard" "Adds a nice dashboard to OctoPrint." ON \
+  "ExcludeRegion" "Select regions of the bed where you don't want to print." ON \
+  "NavbarTemp" "Shows the temperature of the Pi, extruder(s) and bed in the navigation bar." ON \
+  "PrintTimeGenius" "Provides more accurate print time estimates." ON \
+  "HeaterTimeout" "Turns off the hotend and bed after a set amount of time." ON \
+  "TouchUI" "Makes the UI easier to use on touchscreens. Also adds a virtual keyboard." ON 3>&1 1>&2 2>&3)
+
+  RECOMMEND_MENU=($RECOMMEND_MENU)
+   
+  for ((i = 0; i < ${#RECOMMEND_MENU[@]}; i++)); do
+    echo $(( $i * 100 / ${#RECOMMEND_MENU[@]} )) | dialog --title "Plugin Manager" --gauge "Installing ${RECOMMEND_MENU[$i]}" 10 50
+    case ${RECOMMEND_MENU[$i]} in
+      "OctoPrint-Dashboard") install_package "https://github.com/StefanCohen/OctoPrint-Dashboard/archive/master.zip" || error_install "OctoPrint-Dashboard"; install_package "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress/releases/latest/download/master.zip" || error_install "OctoPrint-Dashboard";;
+      "ExcludeRegion") install_package "https://github.com/bradcfisher/OctoPrint-ExcludeRegionPlugin/archive/master.zip" || error_install "ExcludeRegion";;
+      "NavbarTemp") install_package "https://github.com/imrahil/OctoPrint-NavbarTemp/archive/master.zip" || error_install "NavbarTemp";;
+      "PrintTimeGenius") install_package "https://github.com/eyal0/OctoPrint-PrintTimeGenius/archive/master.zip" || error_install "PrintTimeGenius";;
+      "HeaterTimeout") install_package "https://github.com/google/OctoPrint-HeaterTimeout/archive/master.zip" || error_install "HeaterTimeout";;  
+      "TouchUI") install_package "https://github.com/BillyBlaze/OctoPrint-TouchUI/archive/master.zip" || error_install "TouchUI";;
+    esac
+  done
+}
+
+suggested_menu () {
+  local SUGGEST_MENU=$(dialog --nocancel --title "Plugin Manager | Suggested Plugins" --checklist "Check plugins that you wish to install" 0 0 0 \
+  "Themeify" "Adds theming supports and a few themes to OctoPrint." OFF \
+  "Preheat" "Adds a preheat button to preheat the bed and extruder to the temperature set in the selected gcode file." OFF \
+  "ConsolidatedTabs" "Allows you to combine several tabs into one larger tab with draggable and resizable panels." OFF \
+  "DetailedProgress" "Sends commands to your printer to display current printing progress." OFF 3>&1 1>&2 2>&3)
+  
+  SUGGEST_MENU=($SUGGEST_MENU)
+   
+  for ((i = 0; i < ${#SUGGEST_MENU[@]}; i++)); do
+    echo $(( $i * 100 / ${#SUGGEST_MENU[@]} )) | dialog --title "Plugin Manager" --gauge "Installing ${SUGGEST_MENU[$i]}" 10 50
+    case ${SUGGEST_MENU[$i]} in
+      "Themeify") install_package "https://github.com/birkbjo/OctoPrint-Themeify/archive/master.zip" || error_install "Themeify";;
+      "Preheat") install_package "https://github.com/marian42/octoprint-preheat/archive/master.zip" || error_install "Preheat";;
+      "ConsolidatedTabs") install_package "https://github.com/jneilliii/OctoPrint-ConsolidatedTabs/archive/master.zip" || error_install "ConsolidatedTabs";;
+      "DetailedProgress") install_package "https://github.com/tpmullan/OctoPrint-DetailedProgress/archive/master.zip" || error_install "DetailedProgress";;
+    esac
+  done
+}
+
+dialog --title "NOTICE" --nocancel --colors --msgbox "This collection of software is currently in alpha. It is lacking several critical features. \Zb\Z1DO NOT\Zn use this in a production environment. This image has been provided for testing purposes only." 10 50
+
+# Force the user to change the pi user's password before the RPi gets botnetted
+change_password 
+
+dialog --title "Network Configuration" --nocancel --msgbox "Setup will now open nmtui, a program to help configure your ethernet/wireless interfaces. Hit Quit when you are done." 10 50
+nmtui
+
+# Configure the timezone
+dpkg-reconfigure tzdata
+
+# Enable/disable OctoPrint, GUI, MJPG and SSH
+service_select 
+
+screen_timeout
+
+# Makes a certificate and key for Nginx HTTPS
+openssl req -x509 -nodes -days 36500 -newkey rsa:4096 -subj "/C=/ST=/L=/O=/OU=/CN=*/emailAddress=" -out /etc/ssl/certs/nginx-octoprint.crt -keyout /etc/ssl/private/nginx-octoprint.key
+
+# If OctoPrint/MJPG Streamer is running locally, ask if the user wants to change the default listening port/IP (optional)
+if ( [[ -f /etc/systemd/system/multi-user.target.wants/octoprint.service ]] || [[ -f /etc/systemd/system/multi-user.target.wants/mjpg-streamer.service ]] ) && dialog --title "Nginx Config" --defaultno --yesno "Do you wish to change the default Nginx listening address and/or port?" 10 60; then
+  nginx_config
+fi
+
+# If MJPG service is enabled, ask user which video device to use
+if [[ -f /etc/systemd/system/multi-user.target.wants/mjpg-streamer.service ]]; then
+  video_config
+fi
+
+# If OctoPrint is running locally, ask if user wants to preinstall recommended plugins
+if [[ -f /etc/systemd/system/multi-user.target.wants/octoprint.service ]] && dialog --title "Plugin Manager" --yesno "Do you wish to preinstall some suggested plugins?" 10 60; then 
+  recommended_menu || return 1
+  suggested_menu || return 1
+  chown -R octoprint:octoprint /srv/octoprint
+fi
+
+# Delete the autologin override and first-time setup utility
+rm /etc/systemd/system/getty@tty1.service.d/override.conf 
+rm /etc/profile.d/first-time.sh
+reboot
--- a/stage2/06-utils/files/octo-config
+++ b/stage2/06-utils/files/octo-config
@ -0,0 +1,35 @@
+#!/bin/bash
+
+if [ "$EUID" -ne 0 ]; then 
+  echo "This script needs to be run as root."
+  exit 1
+fi
+
+# Import shared functions
+source /usr/local/lib/octo-lib.sh
+
+main_menu () {
+  local MAINMENU=$(dialog --nocancel --title "Pi Setup" --menu "" 10 50 0 \
+     "1" "Configure networking" \
+     "2" "Change password for pi" \
+     "3" "Configure services" \
+     "4" "Configure screen timeout" \
+     "5" "Configure Nginx" \
+     "6" "Configure MJPG" \
+     "7" "Exit" 3>&1 1>&2 2>&3)
+
+  case $MAINMENU in
+    "1") nmtui; main_menu; return 0;;
+    "2") change_password; main_menu; return 0;;
+    "3") service_select; main_menu; return 0;;
+    "4") screen_timeout; main_menu; return 0;;
+    "5") nginx_config; main_menu; return 0;;
+    "6") video_config; main_menu; return 0;;
+    "7") return 0;;
+  esac 
+}
+
+main_menu
+if dialog --title "Reboot Confirmation" --yesno "Some changes require a reboot to take effect.\nDo you want to reboot now?" 10 50; then
+  reboot
+fi
--- a/stage2/06-utils/files/octo-lib.sh
+++ b/stage2/06-utils/files/octo-lib.sh
@ -0,0 +1,139 @@
+change_password () {
+  local PASSWORD="$(dialog --title "Change Password" --nocancel --insecure --passwordbox "Enter new password for user \"pi\"" 10 50 3>&1 1>&2 2>&3)"
+  # If the password field was left blank, exit
+  if [[ $? -ne 0 ]] || [[ $PASSWORD == "" ]]; then return 1; fi
+  # If the password is raspberry, tell the user he is an idiot
+  if [[ "$PASSWORD" == "raspberry" ]]; then
+    dialog --title "Change Password" --nocancel --msgbox "That password sucks. Please use a different one :)" 10 50
+    change_password
+    return 0
+  fi
+  if [[ "$(dialog --nocancel --insecure --passwordbox "Confirm new password for user \"pi\"" 10 50 3>&1 1>&2 2>&3)" == "$PASSWORD" ]]; then
+    if [[ $? != 0 ]]; then return 1; fi 
+    echo -e "pi:$PASSWORD" | chpasswd
+  else
+    dialog --title "Change Password" --nocancel --msgbox "Passwords did not match!" 10 50
+    change_password
+    return 0
+  fi
+  unset PASSWORD
+}
+
+service_select () {
+  # Toggle the checkboxes if the service is active or not
+  local SERVICE_MENU=$(dialog --separate-output --nocancel --title "Select services" --checklist "Enable/disable services" 0 0 0 \
+    "1" "OctoPrint" $(if [[ -f /etc/systemd/system/multi-user.target.wants/octoprint.service ]]; then echo "ON"; else echo "OFF"; fi) \
+    "2" "MJPG-Streamer" $(if [[ -f /etc/systemd/system/multi-user.target.wants/mjpg-streamer.service ]]; then echo "ON"; else echo "OFF"; fi) \
+    "3" "GUI" $(if [[ $(systemctl get-default) == "graphical.target" ]]; then echo "ON"; else echo "OFF"; fi) \
+    "4" "SSH" $(if [[ -f /etc/systemd/system/multi-user.target.wants/ssh.service ]]; then echo "ON"; else echo "OFF"; fi) 3>&1 1>&2 2>&3)
+
+  SERVICE_MENU=($SERVICE_MENU)
+
+  local ENABLE_OCTO=false
+  local ENABLE_MJPG=false
+  local ENABLE_GUI=false
+  local ENABLE_SSH=false
+
+  for i in "${SERVICE_MENU[@]}"; do
+    case $i in
+      "1") ENABLE_OCTO=true ;;
+      "2") ENABLE_MJPG=true ;;
+      "3") ENABLE_GUI=true ;;
+      "4") ENABLE_SSH=true ;;
+    esac
+  done
+
+  if [[ $ENABLE_OCTO == true ]]; then
+    systemctl enable octoprint
+  else
+    systemctl disable octoprint
+  fi
+
+  if [[ $ENABLE_MJPG == true ]]; then
+    systemctl enable mjpg-streamer
+  else
+    systemctl disable mjpg-streamer
+  fi
+
+  if [[ $ENABLE_GUI == true ]]; then
+    systemctl set-default graphical.target 
+  else
+    systemctl set-default multi-user.target  
+  fi
+
+  if [[ $ENABLE_SSH == true ]]; then
+    systemctl enable ssh 
+  else
+    systemctl disable ssh
+  fi
+
+
+<< 'EOF'
+  for ((i = 0; i <= 3; i++)); do
+    for n in "${SERVICE_MENU[@]}"; do
+      if [[ $i == $n ]]; then
+        case $i in
+          "1") systemctl enable octoprint ;;
+          "2") systemctl set-default graphical.target ;;
+          "3") systemctl enable ssh ;;
+        esac
+        break
+      fi
+    done
+    case $i in
+      "1") systemctl disable octoprint ;;
+      "2") systemctl set-default graphical.target ;;
+      "3") systemctl disable ssh ;;
+    esac
+  done
+EOF
+}
+
+screen_timeout() {
+  local TIMEOUT=$(dialog --nocancel --title "Screen Timeout" --inputbox "Input your desired screen timeout in seconds.\nEnter \"off\" to disable the screen timeout.\n\nAdding a screen timeout can reduce screen burn in.\n\nDefault: off" 12 60 "off" 3>&1 1>&2 2>&3) 
+  cat > /home/pi/.xtimeout << EOF
+    xset s ${TIMEOUT}
+    xset -dpms 
+EOF
+}
+
+nginx_config () {
+  local LISTEN=""
+  
+  # Grab the variable from the nginx conf if it exists, otherwise use default
+  if [[ -f /etc/nginx/listen.conf ]]; then
+    LISTEN=$(grep -i listen /etc/nginx/listen.conf | awk '{gsub(";",""); print $2}')
+  else
+    LISTEN="443"
+  fi
+  
+  LISTEN=$(dialog --title "Nginx Config" --nocancel --inputbox "Configure what port and IP Nginx should listen on.\nTo listen on all IPs, just enter the port.\nDefault: 443" 11 50 "$LISTEN" 3>&1 1>&2 2>&3)
+
+  # Write new value to nginx
+  echo "listen $LISTEN;" > /etc/nginx/listen.conf
+}
+  
+video_config () {
+  # In the unlikely event that there are no video devices, don't continue
+  if ! ls /dev/video* 2>&1 >/dev/null; then
+    dialog --title "Error" --msgbox "No video devices detected!" 10 50
+    return 1
+  fi
+
+  # Grab all video devices
+  local DEVICES=($(ls /dev/video*))
+  
+  local DEVICELIST=""
+
+  # Generate a menu from said video devices
+  for ((i = 0; i < ${#DEVICES[@]}; i++)); do
+    DEVICELIST+="${DEVICES[$i]} $i OFF "
+  done
+
+  local DEVICE_MENU=$(dialog --title "Video Config" --nocancel --radiolist "Choose which video device you wish to use for MJPG-Streamer" 10 50 0 $DEVICELIST 3>&1 1>&2 2>&3)
+  
+  [[ "$DEVICE_MENU" == "" ]] && return 0
+ 
+  # Write selected value to startup script
+  echo -e '#!/bin/bash'"\n/usr/local/bin/mjpg_streamer -i \"input_uvc.so -d $DEVICE_MENU\" -o \"output_http.so --port 8080\"" > /usr/local/bin/start-mjpg
+}
--- a/stage2/EXPORT_IMAGE
+++ b/stage2/EXPORT_IMAGE
@ -0,0 +1,4 @@
+IMG_SUFFIX="-lite"
+if [ "${USE_QEMU}" = "1" ]; then
+	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
+fi
--- a/stage2/EXPORT_NOOBS
+++ b/stage2/EXPORT_NOOBS
@ -0,0 +1,2 @@
+NOOBS_NAME="Octoprint"
+NOOBS_DESCRIPTION="A fork of Raspbian with Octoprint"
--- a/stage2/prerun.sh
+++ b/stage2/prerun.sh
@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
+	copy_previous
+fi
--- a/stage3/00-install-packages/00-packages
+++ b/stage3/00-install-packages/00-packages
@ -0,0 +1,20 @@
+gstreamer1.0-x
+gstreamer1.0-plugins-base
+gstreamer1.0-plugins-good
+gstreamer1.0-plugins-bad
+gstreamer1.0-alsa
+gstreamer1.0-libav
+gtk2-engines
+alsa-utils
+raspberrypi-artwork
+policykit-1
+gvfs
+rfkill
+surf
+gldriver-test
+fonts-droid-fallback
+fonts-liberation2
+obconf
+arandr
+openbox
+nodm
--- a/stage3/00-install-packages/00-packages-nr
+++ b/stage3/00-install-packages/00-packages-nr
@ -0,0 +1,11 @@
+xserver-xorg
+xserver-xorg-video-fbdev
+xserver-xorg-video-fbturbo
+xinit
+menu-xdg
+zenity
+xdg-utils
+gvfs-backends
+gvfs-fuse
+gnome-themes-standard
+gnome-icon-theme
--- a/stage3/00-install-packages/01-run.sh
+++ b/stage3/00-install-packages/01-run.sh
@ -0,0 +1,46 @@
+#!/bin/bash -e
+
+#echo -n -e "NODM_USER=${FIRST_USER_NAME}\nNODM_XSESSION=/home/${FIRST_USER_NAME}/.xprofile" > ${ROOTFS_DIR}/etc/nodm.conf
+
+cat > ${ROOTFS_DIR}/etc/default/nodm << EOF
+# nodm configuration
+
+# Set NODM_ENABLED to something different than 'false' to enable nodm
+NODM_ENABLED=true
+
+# User to autologin for
+NODM_USER=${FIRST_USER_NAME}
+
+# First vt to try when looking for free VTs
+NODM_FIRST_VT=7
+
+# X session
+NODM_XSESSION=/home/${FIRST_USER_NAME}/.xprofile
+
+# Options for nodm itself
+NODM_OPTIONS=
+
+# Options for the X server.
+#
+# Format: [/usr/bin/<Xserver>] [:<disp>] <Xserver-options>
+#
+# The Xserver executable and the display name can be omitted, but should
+# be placed in front, if nodm's defaults shall be overridden.
+NODM_X_OPTIONS='-nolisten tcp'
+
+# If an X session will run for less than this time in seconds, nodm will wait an
+# increasing bit of time before restarting the session.
+NODM_MIN_SESSION_TIME=60
+
+# Timeout (in seconds) to wait for X to be ready to accept connections. If X is
+# not ready before this timeout, it is killed and restarted.
+NODM_X_TIMEOUT=300
+EOF 
+
+# Probably not needed
+on_chroot << EOF
+update-alternatives --install /usr/bin/x-www-browser \
+  x-www-browser /usr/bin/surf 86
+update-alternatives --install /usr/bin/gnome-www-browser \
+  gnome-www-browser /usr/bin/surf 86
+EOF
--- a/stage3/01-tweaks/00-run.sh
+++ b/stage3/01-tweaks/00-run.sh
@ -0,0 +1,4 @@
+#!/bin/bash -e
+
+#rm -f "${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/wait.conf"
+
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait`
				`@ -0,0 +1 @@`
				`libraspberrypi-bin libraspberrypi0 raspi-config`