Build improvements

.gitignore

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
 .veid
-=======
->>>>>>> cdeb30b537af4d02d82b35fd997e82cc88bd1f24
 cache
+testing

Makefile.global

@@ -44,7 +44,7 @@ sshkey:
 ifneq ($(strip $(SSH_KEY)),)
 	mkdir -p $(BASEDIR)/root/.ssh
 	echo $(SSH_KEY) >> $(BASEDIR)/root/.ssh/authorized_keys.tmp
-	cat $(BASEDIR)/root/.ssh/authorized_keys.tmp | sed 's/^ //g' | sed 's/^$$//g' > $(BASEDIR)/root/.ssh/authorized_keys
+	cat $(BASEDIR)/root/.ssh/authorized_keys.tmp | sed 's/^ //g' | egrep -v ^$$ > $(BASEDIR)/root/.ssh/authorized_keys
 	rm -f $(BASEDIR)/root/.ssh/authorized_keys.tmp
 endif
 

ansible/.gitignore

@@ -1,8 +1,6 @@
-<<<<<<< HEAD
 .veid
-=======
->>>>>>> cdeb30b537af4d02d82b35fd997e82cc88bd1f24
 config
 info
 logfile
 rootfs
+ubuntu-16.04-ansible_16.04-1_amd64.tar.gz

ansible/README.md

@@ -0,0 +1,5 @@
+# Ansible
+
+- Adds any customizations such as root login enabled or SSH keys from ../Makefile.global
+- Total uncompressed image size is *640 MB*
+- Total compressed image size is *206 MB*

jessie_minimal/.gitignore

@@ -1,8 +1,6 @@
-<<<<<<< HEAD
 .veid
-=======
->>>>>>> cdeb30b537af4d02d82b35fd997e82cc88bd1f24
 config
 info
 logfile
 rootfs
+debian-8.0-minimal_8.5-1_amd64.tar.gz

jessie_minimal/README.md

@@ -3,5 +3,5 @@
 - Built from a minimal debootstrap install of Debian Jessie
 - Contains additional important packages such as an NTP Client and CA Certificates
 - Adds any customizations such as root login enabled or SSH keys from ../Makefile.global
-- Total uncompressed image size is *371 MB*
-- Total compressed image size is *132 MB*
+- Total uncompressed image size is *347 MB*
+- Total compressed image size is *120 MB*