From 0a031c317ef45a13c336a6492bce681e5b34d5c8 Mon Sep 17 00:00:00 2001
From: root <root@stretch.localdomain>
Date: Sun, 3 Sep 2017 23:02:26 +0000
Subject: [PATCH] updating for tarpn

---
 README.md                                     | 30 +++++++++++++++++++
 build.sh                                      | 12 ++++----
 stage2/01-sys-tweaks/01-run.sh                |  5 ++++
 stage2/02-net-tweaks/00-packages              | 16 ++++++++++
 .../02-net-tweaks/files/wpa_supplicant.conf   |  2 +-
 5 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index bc7b4ce..754e10f 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # pi-gen
 
+_Modified version of the tool to create Raspbian Images for TARPN Nodes_
+
 _Tool used to create the raspberrypi.org Raspbian images_
 
 
@@ -9,6 +11,34 @@ _Tool used to create the raspberrypi.org Raspbian images_
 
 ## Dependencies
 
+On MAC OSx Machines you will need
+ * Vagrant - https://www.vagrantup.com
+ * Virtual Box - https://www.virtualbox.org
+
+From a Terminal window you will need to execute the following commands
+```bash
+mkdir raspbian-docker
+cd raspbian-docker
+vagrant init debian/stretc64
+vagrant up
+vagrant ssh
+```
+
+At this point you are in the Vagrant virtual box that is essentially a light weight Debian Linux VM Running on your Apple Macintosh computer.
+Inside this Vagrant connection the following commands need to be executed
+
+```bash
+sudo su - 
+apt-get update
+apt-get install quilt kpartx realpath qemu-user-static debootstrap zerofree pxz zip dosfstools git
+curl https://get.docker.com/ | sh
+
+git clone https://github.com/uuacallis/pi-gen.git
+```
+
+
+
+
 On Debian-based systems:
 
 ```bash
diff --git a/build.sh b/build.sh
index 06d9abc..3f9bcc3 100755
--- a/build.sh
+++ b/build.sh
@@ -167,7 +167,7 @@ dependencies_check ${BASE_DIR}/depends
 mkdir -p ${WORK_DIR}
 log "Begin ${BASE_DIR}"
 
-for STAGE_DIR in ${BASE_DIR}/stage*; do
+for STAGE_DIR in ${BASE_DIR}/stage[0-2]; do
 	run_stage
 done
 
@@ -177,11 +177,11 @@ for EXPORT_DIR in ${EXPORT_DIRS}; do
 	source "${EXPORT_DIR}/EXPORT_IMAGE"
 	EXPORT_ROOTFS_DIR=${WORK_DIR}/$(basename ${EXPORT_DIR})/rootfs
 	run_stage
-	if [ -e ${EXPORT_DIR}/EXPORT_NOOBS ]; then
-		source ${EXPORT_DIR}/EXPORT_NOOBS
-		STAGE_DIR=${BASE_DIR}/export-noobs
-		run_stage
-	fi
+#	if [ -e ${EXPORT_DIR}/EXPORT_NOOBS ]; then
+#		source ${EXPORT_DIR}/EXPORT_NOOBS
+#		STAGE_DIR=${BASE_DIR}/export-noobs
+#		run_stage
+#	fi
 done
 
 if [ -x postrun.sh ]; then
diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh
index 4c72d85..a7d6491 100755
--- a/stage2/01-sys-tweaks/01-run.sh
+++ b/stage2/01-sys-tweaks/01-run.sh
@@ -37,4 +37,9 @@ on_chroot << EOF
 usermod --pass='*' root
 EOF
 
+on_chroot sh -e - <<EOF
+curl -sSL https://get.docker.com/ | sh
+usermod -aG docker pi
+EOF
+
 rm -f ${ROOTFS_DIR}/etc/ssh/ssh_host_*_key*
diff --git a/stage2/02-net-tweaks/00-packages b/stage2/02-net-tweaks/00-packages
index cc4a68e..b1aa724 100644
--- a/stage2/02-net-tweaks/00-packages
+++ b/stage2/02-net-tweaks/00-packages
@@ -2,3 +2,19 @@ wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libert
 raspberrypi-net-mods
 dhcpcd5
 net-tools
+ax25-tools
+ax25-apps
+i2c-tools
+screen
+libcap2-bin
+libpcap0.8
+libpcap-dev
+minicom
+conspy
+telnet
+vim
+libasound2-dev
+build-essential python-dev
+python-serial python3-serial
+rpi-update
+iputils-ping
diff --git a/stage2/02-net-tweaks/files/wpa_supplicant.conf b/stage2/02-net-tweaks/files/wpa_supplicant.conf
index c58b871..a0b21e8 100644
--- a/stage2/02-net-tweaks/files/wpa_supplicant.conf
+++ b/stage2/02-net-tweaks/files/wpa_supplicant.conf
@@ -1,3 +1,3 @@
-country=GB
+country=US
 ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
 update_config=1